diff options
| author | Ard Biesheuvel <ardb@kernel.org> | 2019-12-30 15:07:47 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-17 19:49:07 +0100 |
| commit | 3bc95f564d73754825e8cf373492fecc47a0bbca (patch) | |
| tree | dbaa37e95769300578c6c196fa008a39da19a6a8 /scripts | |
| parent | 8a235a9edc82106257e8f4bd3d5f74139a22553b (diff) | |
| download | linux-stable-3bc95f564d73754825e8cf373492fecc47a0bbca.tar.gz linux-stable-3bc95f564d73754825e8cf373492fecc47a0bbca.tar.bz2 linux-stable-3bc95f564d73754825e8cf373492fecc47a0bbca.zip | |
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package/mkdebian | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 7c230016b08d..357dc56bcf30 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -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 |