Attachment #257905 for bug #349550

View | Details | Raw Unified | Return to bug 349550
Collapse All | Expand All




					self.settings["source_path"]+"\nto "+\
					self.settings["chroot_path"]+\
						" (This may take some time) ...\n"
				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["source_path"]+"\nto "+\
				self.settings["chroot_path"]+\
				" (This may take some time) ...\n"
			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."

				read_from_clst(self.settings["snapshot_cache_path"]+\
				"catalyst-hash")
			destdir=self.settings["snapshot_cache_path"]
			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"]+\

			cleanup_errmsg="Error removing existing snapshot directory."
			cleanup_msg=\
				"Cleaning up existing portage tree (This can take a long time)..."
			unpack_cmd="tar -I pbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
				self.settings["chroot_path"]+"/usr"
			unpack_errmsg="Error unpacking snapshot"



			print "Creating stage tarball..."

			cmd("tar -I pbzip2 -cpf "+self.settings["target_path"]+" -C "+\
				self.settings["stage_path"]+" .",\
				"Couldn't create stage tarball",env=self.env)


Lines 48-54 Link Here

(-)modules/snapshot_target.py (-1 / +1 lines)
48	self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env)	48	self.settings["portdir"]+"/ "+mytmp+"/portage/","Snapshot failure",env=self.env)
49		49
50	print "Compressing Portage snapshot tarball..."	50	print "Compressing Portage snapshot tarball..."
51	cmd("tar cjf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\	51	cmd("tar -I pbzip2 -cf "+self.settings["snapshot_path"]+" -C "+mytmp+" portage",\
52	"Snapshot creation failure",env=self.env)	52	"Snapshot creation failure",env=self.env)
53		53
54	self.gen_contents_file(self.settings["snapshot_path"])	54	self.gen_contents_file(self.settings["snapshot_path"])

Lines 108-114 Link Here

(-)modules/catalyst_support.py (-1 / +1 lines)
108	#"find" :[calc_contents,"find %(path)s"],	108	#"find" :[calc_contents,"find %(path)s"],
109	"tar-tv":[calc_contents,"tar tvf %(file)s"],	109	"tar-tv":[calc_contents,"tar tvf %(file)s"],
110	"tar-tvz":[calc_contents,"tar tvzf %(file)s"],	110	"tar-tvz":[calc_contents,"tar tvzf %(file)s"],
111	"tar-tvj":[calc_contents,"tar tvjf %(file)s"],	111	"tar-tvj":[calc_contents,"tar -I pbzip2 -tvf %(file)s"],
112	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],	112	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
113	# isoinfo-f should be a last resort only	113	# isoinfo-f should be a last resort only
114	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],	114	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],




	# boot-loader/filesystem skeleton for the ISO.
	cdtar=${clst_cdtar}
	[ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
	tar -I pbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
}

extract_kernels() {


		[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
		mkdir -p ${1}/
		tar -I pbzip2 -xf ${kbinary} -C ${1}/ 

		# change config name from "config-*" to "gentoo", for example
		#mv ${1}/config-* ${1}/${x}-config

	if [ -f "${kmodules}" ]
	then
		mkdir -p ${1}/
		tar -I pbzip2 -xf ${kmodules} -C ${1} lib
	else
		echo "Can't find kernel modules tarball at ${kmodules}.  Skipping...."
	fi

	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 -I pbzip2 -xf ${kbinary} -C ${1}/
	# change config name from "config-*" to "gentoo", for example
	#mv ${1}/config-* ${1}/${2}-config
	rm ${1}/config-*

Lines 227-233 Link Here

(-)targets/support/livecdfs-update.sh (-1 / +1 lines)
227	if [ -n "$(ls /lib/firmware)" ]	227	if [ -n "$(ls /lib/firmware)" ]
228	then	228	then
229	cd /lib/firmware	229	cd /lib/firmware
230	/bin/tar cjpf /lib/firmware.tar.bz2 .	230	/bin/tar -I pbzip2 -cpf /lib/firmware.tar.bz2 .
231	rm -rf /lib/firmware/*	231	rm -rf /lib/firmware/*
232	fi	232	fi
233		233

Return to bug 349550

Lines 72-78 Link Here

(-)targets/support/functions.sh (-4 / +4 lines)
72	# boot-loader/filesystem skeleton for the ISO.	72	# boot-loader/filesystem skeleton for the ISO.
73	cdtar=${clst_cdtar}	73	cdtar=${clst_cdtar}
74	[ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"	74	[ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
75	tar xjpf ${cdtar} -C $1 \|\| die "Couldn't extract cdtar ${cdtar}"	75	tar -I pbzip2 -xpf ${cdtar} -C $1 \|\| die "Couldn't extract cdtar ${cdtar}"
76	}	76	}
77		77
78	extract_kernels() {	78	extract_kernels() {
Lines 97-103 Link Here
97		97
98	[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"	98	[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
99	mkdir -p ${1}/	99	mkdir -p ${1}/
100	tar xjf ${kbinary} -C ${1}/	100	tar -I pbzip2 -xf ${kbinary} -C ${1}/
101		101
102	# change config name from "config-*" to "gentoo", for example	102	# change config name from "config-*" to "gentoo", for example
103	#mv ${1}/config-* ${1}/${x}-config	103	#mv ${1}/config-* ${1}/${x}-config
Lines 141-147 Link Here
141	if [ -f "${kmodules}" ]	141	if [ -f "${kmodules}" ]
142	then	142	then
143	mkdir -p ${1}/	143	mkdir -p ${1}/
144	tar xjf ${kmodules} -C ${1} lib	144	tar -I pbzip2 -xf ${kmodules} -C ${1} lib
145	else	145	else
146	echo "Can't find kernel modules tarball at ${kmodules}. Skipping...."	146	echo "Can't find kernel modules tarball at ${kmodules}. Skipping...."
147	fi	147	fi
Lines 153-159 Link Here
153	kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2"	153	kbinary="${clst_chroot_path}/tmp/kerncache/${2}-kernel-initrd-${clst_version_stamp}.tar.bz2"
154	[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"	154	[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
155	mkdir -p ${1}/	155	mkdir -p ${1}/
156	tar xjf ${kbinary} -C ${1}/	156	tar -I pbzip2 -xf ${kbinary} -C ${1}/
157	# change config name from "config-*" to "gentoo", for example	157	# change config name from "config-*" to "gentoo", for example
158	#mv ${1}/config-* ${1}/${2}-config	158	#mv ${1}/config-* ${1}/${2}-config
159	rm ${1}/config-*	159	rm ${1}/config-*

Lines 684-690 Link Here

(-)modules/generic_stage_target.py (-5 / +5 lines)
684	self.settings["source_path"]+"\nto "+\	684	self.settings["source_path"]+"\nto "+\
685	self.settings["chroot_path"]+\	685	self.settings["chroot_path"]+\
686	" (This may take some time) ...\n"	686	" (This may take some time) ...\n"
687	unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\	687	unpack_cmd="tar -I pbzip2 -xpf "+self.settings["source_path"]+" -C "+\
688	self.settings["chroot_path"]	688	self.settings["chroot_path"]
689	error_msg="Tarball extraction of "+\	689	error_msg="Tarball extraction of "+\
690	self.settings["source_path"]+" to "+\	690	self.settings["source_path"]+" to "+\
Lines 695-701 Link Here
695	self.settings["source_path"]+"\nto "+\	695	self.settings["source_path"]+"\nto "+\
696	self.settings["chroot_path"]+\	696	self.settings["chroot_path"]+\
697	" (This may take some time) ...\n"	697	" (This may take some time) ...\n"
698	unpack_cmd="tar xjpf "+self.settings["source_path"]+" -C "+\	698	unpack_cmd="tar -I pbzip2 -xpf "+self.settings["source_path"]+" -C "+\
699	self.settings["chroot_path"]	699	self.settings["chroot_path"]
700	error_msg="Tarball extraction of "+self.settings["source_path"]+\	700	error_msg="Tarball extraction of "+self.settings["source_path"]+\
701	" to "+self.settings["chroot_path"]+" failed."	701	" to "+self.settings["chroot_path"]+" failed."
Lines 793-799 Link Here
793	read_from_clst(self.settings["snapshot_cache_path"]+\	793	read_from_clst(self.settings["snapshot_cache_path"]+\
794	"catalyst-hash")	794	"catalyst-hash")
795	destdir=self.settings["snapshot_cache_path"]	795	destdir=self.settings["snapshot_cache_path"]
796	unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+destdir	796	unpack_cmd="tar -I pbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
797	unpack_errmsg="Error unpacking snapshot"	797	unpack_errmsg="Error unpacking snapshot"
798	cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\	798	cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
799	self.settings["snapshot_cache_path"]+\	799	self.settings["snapshot_cache_path"]+\
Lines 809-815 Link Here
809	cleanup_errmsg="Error removing existing snapshot directory."	809	cleanup_errmsg="Error removing existing snapshot directory."
810	cleanup_msg=\	810	cleanup_msg=\
811	"Cleaning up existing portage tree (This can take a long time)..."	811	"Cleaning up existing portage tree (This can take a long time)..."
812	unpack_cmd="tar xjpf "+self.settings["snapshot_path"]+" -C "+\	812	unpack_cmd="tar -I pbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
813	self.settings["chroot_path"]+"/usr"	813	self.settings["chroot_path"]+"/usr"
814	unpack_errmsg="Error unpacking snapshot"	814	unpack_errmsg="Error unpacking snapshot"
815		815
Lines 1230-1236 Link Here
1230		1230
1231	print "Creating stage tarball..."	1231	print "Creating stage tarball..."
1232		1232
1233	cmd("tar cjpf "+self.settings["target_path"]+" -C "+\	1233	cmd("tar -I pbzip2 -cpf "+self.settings["target_path"]+" -C "+\
1234	self.settings["stage_path"]+" .",\	1234	self.settings["stage_path"]+" .",\
1235	"Couldn't create stage tarball",env=self.env)	1235	"Couldn't create stage tarball",env=self.env)
1236		1236