Merge tag 'kbuild-fixes-v5.5-2' of... (bed72351) · Commits · 戴 / test

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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%,}