Commit 3bc95f56 authored Dec 30, 2019 by Ard Biesheuvel Committed by Greg Kroah-Hartman Jan 17, 2020

kbuild/deb-pkg: annotate libelf-dev dependency as :native



[ Upstream commit 8ffdc54b6f4cd718a45802e645bb853e3a46a078 ]

Cross compiling the x86 kernel on a non-x86 build machine produces
the following error when CONFIG_UNWINDER_ORC is enabled, regardless
of whether libelf-dev is installed or not.

  dpkg-checkbuilddeps: error: Unmet build dependencies: libelf-dev
  dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting
  dpkg-buildpackage: warning: (Use -d flag to override.)

Since this is a build time dependency for a build tool, we need to
depend on the native version of libelf-dev so add the appropriate
annotation.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 8a235a9e

scripts/package/mkdebian

+1 −1

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ mkdir -p debian/source/
		echo "1.0" > debian/source/format

		echo $debarch > debian/arch
		extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev)"
		extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)"
		extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUSTED_KEYRING libssl-dev:native)"

		# Generate a simple changelog template