diff options
| author | Thomas Chou <thomas@wytron.com.tw> | 2006-11-25 11:09:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-11-25 13:28:33 -0800 |
| commit | a26d79ca81d6e46c445c8db87a89740c9b4d17e9 (patch) | |
| tree | 1134141b627cbf3c469f7067054ee4680fe58b36 /usr/Makefile | |
| parent | 8e4d9dcb4205dd43c4297168022ed0c6874fb918 (diff) | |
| download | kernel_samsung_smdk4412-a26d79ca81d6e46c445c8db87a89740c9b4d17e9.zip kernel_samsung_smdk4412-a26d79ca81d6e46c445c8db87a89740c9b4d17e9.tar.gz kernel_samsung_smdk4412-a26d79ca81d6e46c445c8db87a89740c9b4d17e9.tar.bz2 | |
[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>
Diffstat (limited to 'usr/Makefile')
| -rw-r--r-- | usr/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/Makefile b/usr/Makefile index e338e7b..382702a 100644 --- a/usr/Makefile +++ b/usr/Makefile @@ -20,7 +20,7 @@ $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE hostprogs-y := gen_init_cpio initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ - $(CONFIG_INITRAMFS_SOURCE),-d) + $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d) ramfs-args := \ $(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \ $(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID)) |