Attachment #326448 for bug #363577

Lines 7-15 Link Here

(-)catalyst-2.0.11.orig/arch/x86.py (-3 / +6 lines)
7	def __init__(self,myspec):	7	def __init__(self,myspec):
8	builder.generic.__init__(self,myspec)	8	builder.generic.__init__(self,myspec)
9	if self.settings["buildarch"]=="amd64":	9	if self.settings["buildarch"]=="amd64":
10	if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):	10	if os.uname()[0] == "Linux":
11	raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"	11	if not os.path.exists("/bin/linux32") and not os.path.exists("/usr/bin/linux32"):
12	self.settings["CHROOT"]="linux32 chroot"	12	raise CatalystError,"required executable linux32 not found (\"emerge setarch\" to fix.)"
		13	self.settings["CHROOT"]="linux32 chroot"
		14	else:
		15	self.settings["CHROOT"]="chroot"
13	self.settings["crosscompile"] = False;	16	self.settings["crosscompile"] = False;
14	else:	17	else:
15	self.settings["CHROOT"]="chroot"	18	self.settings["CHROOT"]="chroot"





	def set_cleanables(self):
		self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/*","/tmp/*",\
			"/root/*","/usr/portage","/etc/portage/make.conf.catalyst"]

	def set_snapshot_path(self):
		self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\

		if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):
			cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\
				"Could not remove /usr/local/portage",env=self.env)
			if os.path.exists(self.settings["chroot_path"]+"/etc/portage/make.conf"):
				if os.path.exists("/usr/bin/gsed"):
					cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
						"/etc/portage/make.conf",\
						"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
				else:
					cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
						"/etc/portage/make.conf",\
						"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)

		""" Clean up old and obsoleted files in /etc """
		if os.path.exists(self.settings["stage_path"]+"/etc"):

Lines 92-101 Link Here

(-)catalyst-2.0.11.orig/modules/stage1_target.py (+4 lines)
92	# stage_path/proc probably doesn't exist yet, so create it	92	# stage_path/proc probably doesn't exist yet, so create it
93	if not os.path.exists(self.settings["stage_path"]+"/proc"):	93	if not os.path.exists(self.settings["stage_path"]+"/proc"):
94	os.makedirs(self.settings["stage_path"]+"/proc")	94	os.makedirs(self.settings["stage_path"]+"/proc")
		95	if not os.path.exists(self.settings["stage_path"]+"/dev"):
		96	os.makedirs(self.settings["stage_path"]+"/dev")
95		97
96	# alter the mount mappings to bind mount proc onto it	98	# alter the mount mappings to bind mount proc onto it
97	self.mounts.append("/tmp/stage1root/proc")	99	self.mounts.append("/tmp/stage1root/proc")
98	self.mountmap["/tmp/stage1root/proc"]="/proc"	100	self.mountmap["/tmp/stage1root/proc"]="/proc"
		101	self.mounts.append("/tmp/stage1root/dev")
		102	self.mountmap["/tmp/stage1root/dev"]="/dev"
99		103
100	def set_update_seed(self):	104	def set_update_seed(self):
101	if self.settings.has_key("update_seed"):	105	if self.settings.has_key("update_seed"):

Lines 5-8 Link Here

(-)catalyst-2.0.11.orig/targets/stage3/stage3-chroot.sh (-1 / +8 lines)
5	## START BUILD	5	## START BUILD
6	setup_pkgmgr	6	setup_pkgmgr
7		7
8	run_merge "-e system"	8	if [[ $(uname) == "FreeBSD" ]] ; then
		9	# workaround fix bug 438112
		10	run_merge "-e @system --exclude=sys-apps/portage"
		11	run_merge "sys-apps/portage"
		12	else
		13	run_merge "-e system"
		14	fi
		15




Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
}

# GNU sed wrapper
sed(){
	if [ -e /usr/bin/gsed ]
	then
		/usr/bin/gsed "$@"
	elif [ -e /bin/sed ]
	then
		/bin/sed "$@"
	elif [ -e /usr/bin/sed ]
	then
		/usr/bin/sed "$@"
	else
		echo "ERROR: failed the selection of sed."
		exit 1
	fi
}

# We do this everywhere, so why not put it in this script
run_default_funcs

Return to bug 363577

Lines 400-406 Link Here

(-)catalyst-2.0.11.orig/modules/generic_stage_target.py (-4 / +10 lines)
400		400
401	def set_cleanables(self):	401	def set_cleanables(self):
402	self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/","/tmp/",\	402	self.settings["cleanables"]=["/etc/resolv.conf","/var/tmp/","/tmp/",\
403	"/root/*","/usr/portage"]	403	"/root/*","/usr/portage","/etc/portage/make.conf.catalyst"]
404		404
405	def set_snapshot_path(self):	405	def set_snapshot_path(self):
406	self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\	406	self.settings["snapshot_path"]=normpath(self.settings["storedir"]+\
Lines 1083-1091 Link Here
1083	if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):	1083	if os.path.exists(self.settings["chroot_path"]+"/usr/local/portage"):
1084	cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\	1084	cmd("rm -rf "+self.settings["chroot_path"]+"/usr/local/portage",\
1085	"Could not remove /usr/local/portage",env=self.env)	1085	"Could not remove /usr/local/portage",env=self.env)
1086	cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\	1086	if os.path.exists(self.settings["chroot_path"]+"/etc/portage/make.conf"):
1087	"/etc/portage/make.conf",\	1087	if os.path.exists("/usr/bin/gsed"):
1088	"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)	1088	cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
		1089	"/etc/portage/make.conf",\
		1090	"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
		1091	else:
		1092	cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
		1093	"/etc/portage/make.conf",\
		1094	"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
1089		1095
1090	""" Clean up old and obsoleted files in /etc """	1096	""" Clean up old and obsoleted files in /etc """
1091	if os.path.exists(self.settings["stage_path"]+"/etc"):	1097	if os.path.exists(self.settings["stage_path"]+"/etc"):

Lines 413-417 Link Here

(-)catalyst-2.0.11.orig/targets/support/chroot-functions.sh (+17 lines)
413	Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop	413	Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
414	}	414	}
415		415
		416	# GNU sed wrapper
		417	sed(){
		418	if [ -e /usr/bin/gsed ]
		419	then
		420	/usr/bin/gsed "$@"
		421	elif [ -e /bin/sed ]
		422	then
		423	/bin/sed "$@"
		424	elif [ -e /usr/bin/sed ]
		425	then
		426	/usr/bin/sed "$@"
		427	else
		428	echo "ERROR: failed the selection of sed."
		429	exit 1
		430	fi
		431	}
		432
416	# We do this everywhere, so why not put it in this script	433	# We do this everywhere, so why not put it in this script
417	run_default_funcs	434	run_default_funcs