The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Thomas Chou <thomas@wytron.com.tw>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: [PATCH] initramfs : handle more than one source dir or file list
Date: Wed, 08 Nov 2006 14:19:37 +0800	[thread overview]
Message-ID: <455176F9.4080903@wytron.com.tw> (raw)

From: Thomas Chou <thomas@wytron.com.tw>

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

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
---
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))


                 reply	other threads:[~2006-11-08  6:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=455176F9.4080903@wytron.com.tw \
    --to=thomas@wytron.com.tw \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sam@ravnborg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox