The patch titled
initramfs: handle more than one source dir or file list
has been removed from the -mm tree. Its filename was
initramfs-handle-more-than-one-source-dir-or-file-list.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: initramfs: handle more than one source dir or file list
From: Thomas Chou <thomas@xxxxxxxxxxxxx>
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@xxxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Acked-by: Matthew Wilcox <matthew@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
scripts/gen_initramfs_list.sh | 3 ++-
usr/Makefile | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN scripts/gen_initramfs_list.sh~initramfs-handle-more-than-one-source-dir-or-file-list scripts/gen_initramfs_list.sh
--- a/scripts/gen_initramfs_list.sh~initramfs-handle-more-than-one-source-dir-or-file-list
+++ a/scripts/gen_initramfs_list.sh
@@ -158,7 +158,7 @@ unknown_option() {
}
list_header() {
- echo "deps_initramfs := \\"
+ :
}
header() {
@@ -227,6 +227,7 @@ arg="$1"
case "$arg" in
"-l") # files included in initramfs - used by kbuild
dep_list="list_"
+ echo "deps_initramfs := \\"
shift
;;
"-o") # generate gzipped cpio image named $1
diff -puN usr/Makefile~initramfs-handle-more-than-one-source-dir-or-file-list usr/Makefile
--- a/usr/Makefile~initramfs-handle-more-than-one-source-dir-or-file-list
+++ a/usr/Makefile
@@ -20,7 +20,7 @@ $(obj)/initramfs_data.o: $(obj)/initramf
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))
_
Patches currently in -mm which might be from thomas@xxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
