lib/tests/pkgbuild.sh: abstract pack_to_cgz()

Signed-off-by: Philip Li <philip.li@intel.com>

Author: rli9

distro/centos

@@ -5,6 +5,7 @@ shopt -s nullglob
 . $LKP_SRC/lib/install.sh
 . $LKP_SRC/distro/common
 . $LKP_SRC/lib/debug.sh
+. $LKP_SRC/lib/tests/pkgbuild.sh
 
 fixup_distro_mirror()
 {
@@ -85,7 +86,7 @@ pack()
 
 	mv $downloaded_rpms $target_dir
 
-	find $target_dir | cpio --quiet -o -H newc --owner=root.root | gzip -n -9 >$pack_to/${BM_NAME}_$date.cgz
+	find $target_dir | pack_to_cgz "$pack_to/${BM_NAME}_$date.cgz" --owner=root.root
 
 	ln -sf ${BM_NAME}_$date.cgz $pack_to/${BM_NAME}.cgz || return
 	chown .lkp $pack_to/${BM_NAME}_$date.cgz $pack_to/${BM_NAME}.cgz || return

distro/debian

@@ -5,6 +5,7 @@ shopt -s nullglob
 . $LKP_SRC/lib/install.sh
 . $LKP_SRC/distro/common
 . $LKP_SRC/lib/debug.sh
+. $LKP_SRC/lib/tests/pkgbuild.sh
 
 update()
 {
@@ -125,9 +126,7 @@ pack()
 
 		local pkg_dir=$(get_pkg_dir $BM_NAME)
 		[[ -d $pkg_dir && -f $pkg_dir/allowlist ]] && cat $pkg_dir/allowlist
-	} |
-	cpio --quiet -o -H newc --owner=root.root |
-	gzip -n -9 >	$pack_to/${BM_NAME}_$date.cgz	|| return
+	} | pack_to_cgz "$pack_to/${BM_NAME}_$date.cgz" --owner=root.root || return
 
 	ln -sf			 ${BM_NAME}_$date.cgz \
 			$pack_to/${BM_NAME}.cgz		|| return

lib/tests/pkgbuild.sh

@@ -274,3 +274,10 @@ pack_qemu()
 	# create /bin/kvm link that app like avocado list requires kvm bin
 	log_cmd ln -s qemu-system-x86_64 $pkgdir/usr/bin/kvm
 }
+
+pack_to_cgz()
+{
+	local output="$1"
+	shift
+	cpio -o -H newc --quiet "$@" | gzip -n -9 > "$output"
+}

lkp-exec/qemu

@@ -7,6 +7,7 @@
 . $LKP_SRC/lib/job-init.sh
 . $LKP_SRC/lib/lkp_cmd.sh
 . $LKP_SRC/lib/lkp_path.sh
+. $LKP_SRC/lib/tests/pkgbuild.sh
 
 script_name=$(basename $0)
 
@@ -124,7 +125,6 @@ create_job_initrd()
 	mkdir -p $CACHE_DIR/$job_initrd_dir
 	cp $job_script $job_sh
 	chmod +x $job_sh
-	local archive=$CACHE_DIR/job
 	(
 		cd $CACHE_DIR || exit
 		{
@@ -135,9 +135,7 @@ create_job_initrd()
 				echo $dir
 			done
 			find ${job_initrd_dir#/}/*
-		} | cpio -o -H newc -F $archive.cpio
-		gzip -n -9 $archive.cpio
-		mv -f $archive.cpio.gz $CACHE_DIR/$job_initrd
+		} | pack_to_cgz $CACHE_DIR/$job_initrd
 	)
 }
 

pack/default

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $LKP_SRC/lib/git.sh
+. $LKP_SRC/lib/tests/pkgbuild.sh
 
 pre_download()
 {
@@ -114,7 +115,7 @@ pack()
 		echo /lkp/benchmarks/$BM_NAME
 		find /lkp/benchmarks/$BM_NAME/*
 	} |
-	cpio --quiet -o -H newc --owner=root.root | gzip -n -9 > /lkp/benchmarks/${BM_NAME}.cgz
+	pack_to_cgz "/lkp/benchmarks/${BM_NAME}.cgz" --owner=root.root
 	[[ $arch ]] && mv "/lkp/benchmarks/${BM_NAME}.cgz" "/lkp/benchmarks/${BM_NAME}-${arch}.cgz"
 }
 

tools/bm-mkcgz

@@ -1,5 +1,9 @@
 #!/bin/bash
 
+[ -n "$LKP_SRC" ] || export LKP_SRC=$(dirname $(dirname $(readlink -e -v $0)))
+
+. $LKP_SRC/lib/tests/pkgbuild.sh
+
 usage()
 {
 	echo "Usage: $(basename $0) <benchmark>"
@@ -18,4 +22,4 @@ bm_path=/lkp/benchmarks/$BM_NAME
 	exit 1
 }
 
-find $bm_path | cpio -o -H newc | gzip -n -9 > $BM_NAME.cgz
+find $bm_path | pack_to_cgz "$BM_NAME.cgz"