patch for catalyst-2.0.6.915

catalyst-2.0.6.915.patch (text/plain), 4.28 KB, created by Yuta SATOH on 2011-04-14 11:44:41 UTC

diff -Nur catalyst-2.0.6.915.orig/modules/generic_stage_target.py catalyst-2.0.6.915/modules/generic_stage_target.py
--- catalyst-2.0.6.915.orig/modules/generic_stage_target.py	2011-04-11 02:09:58 +0900
+++ catalyst-2.0.6.915/modules/generic_stage_target.py	2011-04-12 23:49:06 +0900
@@ -1091,9 +1091,14 @@
 		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)
-			cmd("sed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
-				"/etc/make.conf",\
-				"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
+			if os.path.exists("/usr/bin/gsed"):
+				cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
+					"/etc/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/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"):
diff -Nur catalyst-2.0.6.915.orig/targets/stage1/stage1-chroot.sh catalyst-2.0.6.915/targets/stage1/stage1-chroot.sh
--- catalyst-2.0.6.915.orig/targets/stage1/stage1-chroot.sh	2011-04-11 02:09:58 +0900
+++ catalyst-2.0.6.915/targets/stage1/stage1-chroot.sh	2011-04-12 23:49:06 +0900
@@ -4,6 +4,7 @@
 export clst_buildpkgs="$(/tmp/build.py)"
 
 source /tmp/chroot-functions.sh
+sed_selector
 
 # Setup our environment
 STAGE1_USE="$(portageq envvar STAGE1_USE)"
@@ -23,7 +24,7 @@
 [ -e /etc/make.conf ] && \
 	echo 'USE="${USE} -build"' >> /etc/make.conf
 run_merge "--oneshot --nodeps sys-apps/baselayout"
-sed -i '/USE="${USE} -build"/d' /etc/make.conf
+${SED} -i '/USE="${USE} -build"/d' /etc/make.conf
 
 # Next, we install the package manager
 clst_root_path=/ setup_pkgmgr
@@ -34,5 +35,5 @@
 	echo "USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"" \
 	>> /etc/make.conf
 run_merge "--oneshot ${clst_buildpkgs}"
-sed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
+${SED} -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
 	/etc/make.conf
diff -Nur catalyst-2.0.6.915.orig/targets/stage1/stage1-preclean-chroot.sh catalyst-2.0.6.915/targets/stage1/stage1-preclean-chroot.sh
--- catalyst-2.0.6.915.orig/targets/stage1/stage1-preclean-chroot.sh	2011-04-11 02:09:58 +0900
+++ catalyst-2.0.6.915/targets/stage1/stage1-preclean-chroot.sh	2011-04-12 23:49:06 +0900
@@ -4,6 +4,8 @@
 
 source /tmp/chroot-functions.sh
 
+sed_selector
+${SED} -i '/^PORTDIR_OVERLAY/d' /etc/make.conf
 update_env_settings
 show_debug
 
diff -Nur catalyst-2.0.6.915.orig/targets/support/chroot-functions.sh catalyst-2.0.6.915/targets/support/chroot-functions.sh
--- catalyst-2.0.6.915.orig/targets/support/chroot-functions.sh	2011-04-11 02:09:58 +0900
+++ catalyst-2.0.6.915/targets/support/chroot-functions.sh	2011-04-12 23:50:14 +0900
@@ -60,6 +60,7 @@
 }
 
 setup_myfeatures(){
+	sed_selector
 	setup_myemergeopts
 	if [ -n "${clst_CCACHE}" ]
 	then
@@ -83,7 +84,7 @@
 		else
 			clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
 		fi
-		sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
+		${SED} -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/make.conf
 		mkdir -p /etc/distcc
 		echo "${clst_distcc_hosts}" > /etc/distcc/hosts
 		# We need to run distcc-config, since it might not have gotten run
@@ -168,7 +169,8 @@
 	# just let emerge system could merge it.
 	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
 	run_merge --oneshot --nodeps sys-apps/portage
-	sed -i '/USE="${USE} build"/d' /etc/make.conf
+	sed_selector
+	${SED} -i '/USE="${USE} build"/d' /etc/make.conf
 }
 
 cleanup_distcc() {
@@ -234,7 +236,8 @@
 
 make_destpath() {
 	# ROOT is / by default, so remove any ROOT= settings from make.conf
-	sed -i '/ROOT=/d' /etc/make.conf
+	sed_selector
+	${SED} -i '/ROOT=/d' /etc/make.conf
 	export ROOT=/
 	if [ "${1}" != "/" -a -n "${1}" ] 
 	then
@@ -410,6 +413,14 @@
 Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
 }
 
+sed_selector() {
+	if [ -e "/usr/bin/gsed" ]; then
+		SED="gsed"
+	else
+		SED="sed"
+	fi
+}
+
 # We do this everywhere, so why not put it in this script
 run_default_funcs