Commit bed72351 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'kbuild-fixes-v5.5-2' of...

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
parents d9c82fd8 8ffdc54b
...@@ -136,7 +136,7 @@ mkdir -p debian/source/ ...@@ -136,7 +136,7 @@ mkdir -p debian/source/
echo "1.0" > debian/source/format echo "1.0" > debian/source/format
echo $debarch > debian/arch 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)" extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUSTED_KEYRING libssl-dev:native)"
# Generate a simple changelog template # Generate a simple changelog template
......
...@@ -128,7 +128,7 @@ parse() { ...@@ -128,7 +128,7 @@ parse() {
str="${ftype} ${name} ${location} ${str}" str="${ftype} ${name} ${location} ${str}"
;; ;;
"nod") "nod")
local dev=`LC_ALL=C ls -l "${location}"` local dev="`LC_ALL=C ls -l "${location}"`"
local maj=`field 5 ${dev}` local maj=`field 5 ${dev}`
local min=`field 6 ${dev}` local min=`field 6 ${dev}`
maj=${maj%,} maj=${maj%,}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment