[patch] use-pbzip2.patch

use-pbzip2.patch (text/plain), 5.19 KB, created by Matt Turner on 2010-12-24 01:35:59 UTC

Index: modules/generic_stage_target.py
===================================================================
--- modules/generic_stage_target.py	(revision 1411)
+++ modules/generic_stage_target.py	(working copy)
@@ -684,7 +684,7 @@
 					self.settings["source_path"]+"\nto "+\
 					self.settings["chroot_path"]+\
 						" (This may take some time) ...\n"
-				unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\
+				unpack_cmd="tar -I pbzip2 -xpf "+self.settings["source_path"]+" -C "+\
 					self.settings["chroot_path"]
 				error_msg="Tarball extraction of "+\
 					self.settings["source_path"]+" to "+\
@@ -695,7 +695,7 @@
 				self.settings["source_path"]+"\nto "+\
 				self.settings["chroot_path"]+\
 				" (This may take some time) ...\n"
-			unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\
+			unpack_cmd="tar -I pbzip2 -xpf "+self.settings["source_path"]+" -C "+\
 				self.settings["chroot_path"]
 			error_msg="Tarball extraction of "+self.settings["source_path"]+\
 				" to "+self.settings["chroot_path"]+" failed."
@@ -793,7 +793,7 @@
 				read_from_clst(self.settings["snapshot_cache_path"]+\
 				"catalyst-hash")
 			destdir=self.settings["snapshot_cache_path"]
-			unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+destdir
+			unpack_cmd="tar -I pbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
 			unpack_errmsg="Error unpacking snapshot"
 			cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
 				self.settings["snapshot_cache_path"]+\
@@ -809,7 +809,7 @@
 			cleanup_errmsg="Error removing existing snapshot directory."
 			cleanup_msg=\
 				"Cleaning up existing portage tree (This can take a long time)..."
-			unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+\
+			unpack_cmd="tar -I pbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
 				self.settings["chroot_path"]+"/usr"
 			unpack_errmsg="Error unpacking snapshot"
 
@@ -1230,7 +1230,7 @@
 
 			print "Creating stage tarball..."
 
-			cmd("tar cjpf "+self.settings["target_path"]+" -C "+\
+			cmd("tar -I pbzip2 -cpf "+self.settings["target_path"]+" -C "+\
 				self.settings["stage_path"]+" .",\
 				"Couldn't create stage tarball",env=self.env)
 
Index: modules/snapshot_target.py
===================================================================
--- modules/snapshot_target.py	(revision 1411)
+++ modules/snapshot_target.py	(working copy)
@@ -48,7 +48,7 @@
 			self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env)
 		
 		print "Compressing Portage snapshot tarball..."
-		cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
+		cmd("tar -I pbzip2 -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
 			"Snapshot creation failure",env=self.env)
 		
 		self.gen_contents_file(self.settings["snapshot_path"])
Index: modules/catalyst_support.py
===================================================================
--- modules/catalyst_support.py	(revision 1411)
+++ modules/catalyst_support.py	(working copy)
@@ -108,7 +108,7 @@
 	#"find"		:[calc_contents,"find %(path)s"],
 	"tar-tv":[calc_contents,"tar tvf %(file)s"],
 	"tar-tvz":[calc_contents,"tar tvzf %(file)s"],
-	"tar-tvj":[calc_contents,"tar tvjf %(file)s"],
+	"tar-tvj":[calc_contents,"tar -I pbzip2 -tvf %(file)s"],
 	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
 	# isoinfo-f should be a last resort only
 	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
Index: targets/support/functions.sh
===================================================================
--- targets/support/functions.sh	(revision 1411)
+++ targets/support/functions.sh	(working copy)
@@ -72,7 +72,7 @@
 	# boot-loader/filesystem skeleton for the ISO.
 	cdtar=${clst_cdtar}
 	[ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
-	tar xjpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+	tar -I pbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
 }
 
 extract_kernels() {
@@ -97,7 +97,7 @@
 
 		[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
 		mkdir -p ${1}/
-		tar xjf ${kbinary} -C ${1}/ 
+		tar -I pbzip2 -xf ${kbinary} -C ${1}/ 
 
 		# change config name from "config-*" to "gentoo", for example
 		#mv ${1}/config-* ${1}/${x}-config
@@ -141,7 +141,7 @@
 	if [ -f "${kmodules}" ]
 	then
 		mkdir -p ${1}/
-		tar xjf ${kmodules} -C ${1} lib
+		tar -I pbzip2 -xf ${kmodules} -C ${1} lib
 	else
 		echo "Can't find kernel modules tarball at ${kmodules}.  Skipping...."
 	fi
@@ -153,7 +153,7 @@
 	kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2"
 	[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
 	mkdir -p ${1}/
-	tar xjf ${kbinary} -C ${1}/
+	tar -I pbzip2 -xf ${kbinary} -C ${1}/
 	# change config name from "config-*" to "gentoo", for example
 	#mv ${1}/config-* ${1}/${2}-config
 	rm ${1}/config-*
Index: targets/support/livecdfs-update.sh
===================================================================
--- targets/support/livecdfs-update.sh	(revision 1411)
+++ targets/support/livecdfs-update.sh	(working copy)
@@ -227,7 +227,7 @@
 if [ -n "$(ls /lib/firmware)" ]
 then
 	cd /lib/firmware
-	/bin/tar cjpf /lib/firmware.tar.bz2 .
+	/bin/tar -I pbzip2 -cpf /lib/firmware.tar.bz2 .
 	rm -rf /lib/firmware/*
 fi