diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-03 20:21:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-03 20:21:25 +0100 |
| commit | bed723519a72c0f68fbfaf68ed5bf55d04e46566 (patch) | |
| tree | 66dd282510214f57ca4f91324cc21386c54b9f39 | |
| parent | Merge tag 'for-linus-2020-01-03' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | kbuild/deb-pkg: annotate libelf-dev dependency as :native (diff) | |
| download | linux-bed723519a72c0f68fbfaf68ed5bf55d04e46566.tar.xz linux-bed723519a72c0f68fbfaf68ed5bf55d04e46566.zip | |
Merge tag 'kbuild-fixes-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
Pull Kbuild fixes from Masahiro Yamada:
- fix build error in usr/gen_initramfs_list.sh
- fix libelf-dev dependency in deb-pkg build
* tag 'kbuild-fixes-v5.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
kbuild/deb-pkg: annotate libelf-dev dependency as :native
gen_initramfs_list.sh: fix 'bad variable name' error
| -rwxr-xr-x | scripts/package/mkdebian | 2 | ||||
| -rwxr-xr-x | usr/gen_initramfs_list.sh | 2 |
2 files changed, 2 insertions, 2 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 diff --git a/usr/gen_initramfs_list.sh b/usr/gen_initramfs_list.sh index 0aad760fcd8c..2bbac73e6477 100755 --- a/usr/gen_initramfs_list.sh +++ b/usr/gen_initramfs_list.sh @@ -128,7 +128,7 @@ parse() { str="${ftype} ${name} ${location} ${str}" ;; "nod") - local dev=`LC_ALL=C ls -l "${location}"` + local dev="`LC_ALL=C ls -l "${location}"`" local maj=`field 5 ${dev}` local min=`field 6 ${dev}` maj=${maj%,} |