Date:	Mon, 16 Apr 2007 16:20:27 +0300
From:	"Alex Landau" <landau.alex@...il.com>
To:	sam@...nborg.org
Cc:	linux-kernel@...r.kernel.org
Subject: [PATCH] kbuild: Handle compressed cpio initramfs-es

Make kbuild handle compressed cpio initramfs-es. An already
compressed cpio is copied directly to usr/, while a non-compressed cpio
is filtered through gzip (no changes here) on its way to usr/.

Signed-off-by: Alex Landau <landau.alex@...il.com>
---
If the user has created a compressed cpio by other means, this saves
him from uncompressing it, just to be compressed again by kbuild.
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -190,9 +190,10 @@
 	source="$1"
 	if [ -f "$1" ]; then
 		${dep_list}header "$1"
-		is_cpio="$(echo "$1" | sed 's/^.*\.cpio/cpio/')"
+		is_cpio="$(echo "$1" | sed 's/^.*\.cpio\(\..*\)\?/cpio/')"
 		if [ $2 -eq 0 -a ${is_cpio} == "cpio" ]; then
 			cpio_file=$1
+			echo "$1" | grep -q '^.*\.cpio\..*' && is_cpio_compressed="compressed"
 			[ ! -z ${dep_list} ] && echo "$1"
 			return 0
 		fi
@@ -222,6 +223,7 @@
 cpio_list=
 output="/dev/stdout"
 output_file=""
+is_cpio_compressed=

 arg="$1"
 case "$arg" in
@@ -281,7 +283,11 @@
 		cpio_tfile=${cpio_file}
 	fi
 	rm ${cpio_list}
-	cat ${cpio_tfile} | gzip -f -9 - > ${output_file}
+	if [ "${is_cpio_compressed}" = "compressed" ]; then
+		cat ${cpio_tfile} > ${output_file}
+	else
+		cat ${cpio_tfile} | gzip -f -9 - > ${output_file}
+	fi
 	[ -z ${cpio_file} ] && rm ${cpio_tfile}
 fi
 exit 0
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists