| From 054c1ef0e45b173c4d116388dd80961d71c90d6c Mon Sep 17 00:00:00 2001 |
| From: Masahiro Yamada <masahiroy@kernel.org> |
| Date: Mon, 30 Dec 2019 22:20:06 +0900 |
| Subject: [PATCH] gen_initramfs_list.sh: fix 'bad variable name' error |
| |
| commit cc976614f59bd8e45de8ce988a6bcb5de711d994 upstream. |
| |
| Prior to commit 858805b336be ("kbuild: add $(BASH) to run scripts with |
| bash-extension"), this shell script was almost always run by bash since |
| bash is usually installed on the system by default. |
| |
| Now, this script is run by sh, which might be a symlink to dash. On such |
| distributions, the following code emits an error: |
| |
| local dev=`LC_ALL=C ls -l "${location}"` |
| |
| You can reproduce the build error, for example by setting |
| CONFIG_INITRAMFS_SOURCE="/dev". |
| |
| GEN usr/initramfs_data.cpio.gz |
| ./usr/gen_initramfs_list.sh: 131: local: 1: bad variable name |
| make[1]: *** [usr/Makefile:61: usr/initramfs_data.cpio.gz] Error 2 |
| |
| This is because `LC_ALL=C ls -l "${location}"` contains spaces. |
| Surrounding it with double-quotes fixes the error. |
| |
| Fixes: 858805b336be ("kbuild: add $(BASH) to run scripts with bash-extension") |
| Reported-by: Jory A. Pratt <anarchy@gentoo.org> |
| Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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%,} |
| -- |
| 2.7.4 |
| |