Skip to contentSkip to conversation

kbuild: Include gen_initramfs_list.sh and the file list in the .d file

PATCH Applied Jason Gunthorpe 2 participants 2 messages Mar 22, 2010 – Mar 23, 2010 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: Include gen_initramfs_list.sh and the file list in the .d file

Expand the dependency set used for the initrd to include the CONFIG_INITRAMFS_SOURCE file and the generator script itself.

---
 scripts/gen_initramfs_list.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Otherwise changing the initramfs file list does not rebuild the CPIO..

scripts/gen_initramfs_list.sh +2 -1
index 76af5f9..f3b5c05 100644
@@ -202,6 +202,7 @@ input_file() {
 			print_mtime "$1" >> ${output}
 			cat "$1"         >> ${output}
 		else
+		        echo "$1 \\"
 			cat "$1" | while read type dir file perm ; do
 				if [ "$type" == "file" ]; then
 					echo "$file \\";
@@ -231,7 +232,7 @@ arg="$1"
 case "$arg" in
 	"-l")	# files included in initramfs - used by kbuild
 		dep_list="list_"
-		echo "deps_initramfs := \\"
+		echo "deps_initramfs := $0 \\"
 		shift
 		;;
 	"-o")	# generate compressed cpio image named $1
Signature · 1 line
1.5.4.2
Applied
#1 lore raw
Quoted 9 lines · Jason Gunthorpe

Expand the dependency set used for the initrd to include the CONFIG_INITRAMFS_SOURCE file and the generator script itself.

---
 scripts/gen_initramfs_list.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Otherwise changing the initramfs file list does not rebuild the CPIO..

Thanks, applied.

Michal

Quoted 22 lines
scripts/gen_initramfs_list.sh +2 -1
index 76af5f9..f3b5c05 100644
@@ -202,6 +202,7 @@ input_file() {
 			print_mtime "$1" >> ${output}
 			cat "$1"         >> ${output}
 		else
+		        echo "$1 \\"
 			cat "$1" | while read type dir file perm ; do
 				if [ "$type" == "file" ]; then
 					echo "$file \\";
@@ -231,7 +232,7 @@ arg="$1"
 case "$arg" in
 	"-l")	# files included in initramfs - used by kbuild
 		dep_list="list_"
-		echo "deps_initramfs := \\"
+		echo "deps_initramfs := $0 \\"
 		shift
 		;;
 	"-o")	# generate compressed cpio image named $1