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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Thomas Chou <[email protected]>

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

Signed-off-by: Thomas Chou <[email protected]>
---
Bug ID 7401, updated

diff -uprN -X linux-2.6.19-rc3-vanilla/Documentation/dontdiff linux-2.6.19-rc3-vanilla/scripts/gen_initramfs_list.sh linux-2.6.19-rc3/scripts/gen_initramfs_list.sh
--- linux-2.6.19-rc3-vanilla/scripts/gen_initramfs_list.sh    2006-09-20 11:42:06.000000000 +0800
+++ linux-2.6.19-rc3/scripts/gen_initramfs_list.sh    2006-10-25 09:59:28.000000000 +0800
@@ -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 -uprN -X linux-2.6.19-rc3-vanilla/Documentation/dontdiff linux-2.6.19-rc3-vanilla/usr/Makefile linux-2.6.19-rc3/usr/Makefile
--- linux-2.6.19-rc3-vanilla/usr/Makefile    2006-10-25 09:53:54.000000000 +0800
+++ linux-2.6.19-rc3/usr/Makefile    2006-10-25 09:58:41.000000000 +0800
@@ -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))







___________________________________________________ 
 您的生活即時通 - 溝通、娛樂、生活、工作一次搞定! 
 http://messenger.yahoo.com.tw/




___________________________________________________ 
 您的生活即時通 - 溝通、娛樂、生活、工作一次搞定! 
 http://messenger.yahoo.com.tw/
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Stuff]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]     [Linux Resources]
  Powered by Linux