gen_initramfs.sh: always output cpio even without -o option (469e87e8) · Commits · 戴 / test

usr/gen_initramfs.sh

+27 −31

Original line number	Diff line number	Diff line
		@@ -6,7 +6,6 @@
		#
		# Generate a cpio packed initramfs. It uses gen_init_cpio to generate
		# the cpio archive, and then compresses it.
		# The script may also be used to generate the inputfile used for gen_init_cpio
		# This script assumes that gen_init_cpio is located in usr/ directory

		# error out on errors
		@@ -71,8 +70,8 @@ print_mtime() {
		my_mtime=$(find "$1" -printf "%T@\n" \| sort -r \| head -n 1)
		fi

		echo "# Last modified: ${my_mtime}" >> ${output}
		echo "" >> ${output}
		echo "# Last modified: ${my_mtime}" >> $cpio_list
		echo "" >> $cpio_list
		}

		list_parse() {
		@@ -125,7 +124,7 @@ parse() {
		;;
		esac

		echo "${str}" >> ${output}
		echo "${str}" >> $cpio_list

		return 0
		}
		@@ -141,7 +140,7 @@ unknown_option() {
		}

		header() {
		printf "\n#####################\n# $1\n" >> ${output}
		printf "\n#####################\n# $1\n" >> $cpio_list
		}

		# process one directory (incl sub-directories)
		@@ -177,8 +176,8 @@ input_file() {
		[ -n "$dep_list" ] && echo "$1" >> $dep_list
		return 0
		fi
		print_mtime "$1" >> ${output}
		cat "$1" >> ${output}
		print_mtime "$1" >> $cpio_list
		cat "$1" >> $cpio_list
		if [ -n "$dep_list" ]; then
		echo "$1 \\" >> $dep_list
		cat "$1" \| while read type dir file perm ; do
		@@ -200,9 +199,9 @@ root_uid=0
		root_gid=0
		dep_list=
		cpio_file=
		cpio_list=
		cpio_list=$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)
		output="/dev/stdout"
		output_file=""
		output_file="/dev/stdout"
		is_cpio_compressed=
		compr="gzip -n -9 -f"

		@@ -217,8 +216,7 @@ while [ $# -gt 0 ]; do
		;;
		"-o") # generate compressed cpio image named $1
		output_file="$1"
		cpio_list="$(mktemp ${TMPDIR:-/tmp}/cpiolist.XXXXXX)"
		output=${cpio_list}
		output=$cpio_list
		echo "$output_file" \| grep -q "\.gz$" \
		&& [ -x "`which gzip 2> /dev/null`" ] \
		&& compr="gzip -n -9 -f"
		@@ -269,7 +267,6 @@ done

		# If output_file is set we will generate cpio archive and compress it
		# we are careful to delete tmp files
		if [ ! -z ${output_file} ]; then
		if [ -z ${cpio_file} ]; then
		timestamp=
		if test -n "$KBUILD_BUILD_TIMESTAMP"; then
		@@ -291,5 +288,4 @@ if [ ! -z ${output_file} ]; then
		\|\| (rm -f ${output_file} ; false)
		fi
		[ -z ${cpio_file} ] && rm ${cpio_tfile}
		fi
		exit 0

Admin message