Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a26d79ca81d6e46c445c8db87a89740c9b4d17e9

Authored by Thomas Chou
Committed by Linus Torvalds
1 parent 8e4d9dcb42
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] initramfs: handle more than one source dir or file list 

Fix bug 7401.

Handle more than one source dir or file list to the initramfs gen scripts.

The Kconfig help for INITRAMFS_SOURCE claims that you can specify multiple
space-separated sources in order to allow unprivileged users to build an
image.  There are two bugs in the current implementation that prevent this
from working.

First, we pass "file1 dir2" to the gen_initramfs_list.sh script, which it
obviously can't open.

Second, gen_initramfs_list.sh -l outputs multiple definitions for
deps_initramfs -- one for each argument.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

scripts/gen_initramfs_list.sh
Diff comments   View file @ a26d79c
... ... @@ -158,7 +158,7 @@
158 158 }
159 159  
160 160 list_header() {
161   - echo "deps_initramfs := \\"
  161 + :
162 162 }
163 163  
164 164 header() {
... ... @@ -227,6 +227,7 @@
227 227 case "$arg" in
228 228 "-l") # files included in initramfs - used by kbuild
229 229 dep_list="list_"
  230 + echo "deps_initramfs := \\"
230 231 shift
231 232 ;;
232 233 "-o") # generate gzipped cpio image named $1
... ... @@ -20,7 +20,7 @@
20 20 hostprogs-y := gen_init_cpio
21 21 initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
22 22 ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
23   - $(CONFIG_INITRAMFS_SOURCE),-d)
  23 + $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
24 24 ramfs-args := \
25 25 $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
26 26 $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))