The patch titled
initramfs: handle more than one source dir or file
has been removed from the -mm tree. Its filename was
initramfs-handle-more-than-one-source-dir-or-file.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: initramfs: handle more than one source dir or file
From: Thomas Chou <hippo5329@xxxxxxxxxxxx>
Handle more than one source dir or filelist to the initramfs gen scripts.
Signed-off-by: Thomas Chou <hippo5329@xxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
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 scripts/gen_initramfs_list.sh
--- a/scripts/gen_initramfs_list.sh~initramfs-handle-more-than-one-source-dir-or-file
+++ a/scripts/gen_initramfs_list.sh
@@ -158,7 +158,7 @@ unknown_option() {
}
list_header() {
- echo "deps_initramfs := \\"
+ return 0;
}
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 usr/Makefile
--- a/usr/Makefile~initramfs-handle-more-than-one-source-dir-or-file
+++ 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 hippo5329@xxxxxxxxxxxx are
initramfs-handle-more-than-one-source-dir-or-file.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
