[patch] patch for catalyst on x86-fbsd/amd64-fbsd

catalyst-2.0.6.914-fbsd.patch (text/plain), 11.47 KB, created by Yuta SATOH on 2011-02-21 16:08:27 UTC

diff -Nur catalyst.orig/modules/generic_stage_target.py catalyst/modules/generic_stage_target.py
--- catalyst.orig/modules/generic_stage_target.py	2011-02-20 02:32:47 +0900
+++ catalyst/modules/generic_stage_target.py	2011-02-20 05:26:41 +0900
@@ -1091,7 +1091,7 @@
 		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"]+\
+			cmd("gsed -i '/^PORTDIR_OVERLAY/d' "+self.settings["chroot_path"]+\
 				"/etc/make.conf",\
 				"Could not remove PORTDIR_OVERLAY from make.conf",env=self.env)
 
diff -Nur catalyst.orig/targets/stage1/stage1-chroot.sh catalyst/targets/stage1/stage1-chroot.sh
--- catalyst.orig/targets/stage1/stage1-chroot.sh	2011-02-20 02:32:47 +0900
+++ catalyst/targets/stage1/stage1-chroot.sh	2011-02-20 05:26:50 +0900
@@ -23,7 +23,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
+gsed -i '/USE="${USE} -build"/d' /etc/make.conf
 
 # Next, we install the package manager
 clst_root_path=/ setup_pkgmgr
@@ -34,5 +34,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" \
+gsed -i "/USE=\"-* bindist build ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \
 	/etc/make.conf
diff -Nur catalyst.orig/targets/support/bootloader-setup.sh catalyst/targets/support/bootloader-setup.sh
--- catalyst.orig/targets/support/bootloader-setup.sh	2011-02-20 02:32:48 +0900
+++ catalyst/targets/support/bootloader-setup.sh	2011-02-20 05:28:06 +0900
@@ -66,7 +66,7 @@
 		echo "message=/boot/boot.msg" >> ${icfg}
 		
 		# Here is where I fix up the boot.msg file.
-		sed -e 's/ARCH/PowerPC/' \
+		gsed -e 's/ARCH/PowerPC/' \
 			-e 's/HARDWARE/Apple and IBM hardware/' \
 			-i $kmsg
 
diff -Nur catalyst.orig/targets/support/chroot-functions.sh catalyst/targets/support/chroot-functions.sh
--- catalyst.orig/targets/support/chroot-functions.sh	2011-02-20 02:32:48 +0900
+++ catalyst/targets/support/chroot-functions.sh	2011-02-20 05:27:30 +0900
@@ -83,7 +83,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
+		gsed -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 +168,7 @@
 	# just let emerge system could merge it.
 	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
 	run_merge --oneshot --nodeps virtual/portage
-	sed -i '/USE="${USE} build"/d' /etc/make.conf
+	gsed -i '/USE="${USE} build"/d' /etc/make.conf
 }
 
 cleanup_distcc() {
@@ -234,7 +234,7 @@
 
 make_destpath() {
 	# ROOT is / by default, so remove any ROOT= settings from make.conf
-	sed -i '/ROOT=/d' /etc/make.conf
+	gsed -i '/ROOT=/d' /etc/make.conf
 	export ROOT=/
 	if [ "${1}" != "/" -a -n "${1}" ] 
 	then
diff -Nur catalyst.orig/targets/support/create-iso.sh catalyst/targets/support/create-iso.sh
--- catalyst.orig/targets/support/create-iso.sh	2011-02-20 02:32:48 +0900
+++ catalyst/targets/support/create-iso.sh	2011-02-20 05:27:37 +0900
@@ -189,10 +189,10 @@
 		if [ -f ${clst_target_path}/ppc/bootinfo.txt ]
 		then
 			echo "bootinfo.txt found .. updating it"
-			sed -i -e \
+			gsed -i -e \
 			's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \
 			${clst_target_path}/ppc/bootinfo.txt
-			sed -i -e \
+			gsed -i -e \
 			's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
 			${clst_target_path}/ppc/bootinfo.txt
 		fi
diff -Nur catalyst.orig/targets/support/kmerge.sh catalyst/targets/support/kmerge.sh
--- catalyst.orig/targets/support/kmerge.sh	2011-02-20 02:32:48 +0900
+++ catalyst/targets/support/kmerge.sh	2011-02-20 05:28:13 +0900
@@ -224,7 +224,7 @@
 	if [ ! "${clst_kextraversion}" = "" ]
 	then
 		echo "Setting extraversion to ${clst_kextraversion}"
-		sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
+		gsed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
 		echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
 	else 
 		touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
@@ -232,12 +232,12 @@
 fi
 
 build_kernel
-sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/make.conf
+gsed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/make.conf
 # grep out the kernel version so that we can do our modules magic
 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
-EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
+EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | gsed -e "s/EXTRAVERSION =//" -e "s/ //g"`
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
 /sbin/update-modules --assume-kernel=${clst_fudgeuname}
@@ -250,6 +250,6 @@
 then
 	if [ -e /etc/portage/profile/package.provided ]
 	then
-		sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
+		gsed -i "/^$(echo "${KERNELVERSION}" | gsed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
 	fi
 fi
diff -Nur catalyst.orig/targets/support/livecdfs-update.sh catalyst/targets/support/livecdfs-update.sh
--- catalyst.orig/targets/support/livecdfs-update.sh	2011-02-20 02:32:48 +0900
+++ catalyst/targets/support/livecdfs-update.sh	2011-02-20 05:28:20 +0900
@@ -7,15 +7,15 @@
 # Allow root logins to our CD by default
 if [ -e /etc/sshd/sshd_config ]
 then
-	sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
+	gsed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
 		/etc/ssh/sshd_config
 fi
 
 # Turn off udev tarball
-sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
+gsed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
 
 # Turn off udev coldplugging
-sed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
+gsed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
 
 # Clean up the time and set to UTC
 rm -rf /etc/localtime
@@ -79,7 +79,7 @@
 # Setup sudoers
 if [ -f /etc/sudoers ]
 then
-	sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
+	gsed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
 fi
 
 # Setup links for ethernet devices
@@ -120,7 +120,7 @@
 cat /etc/make.conf.old >> /etc/make.conf
 
 # devfs tweaks
-[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
+[ -e /etc/devfsd.conf ] && gsed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
 
 # Add some helpful aliases
 echo "alias cp='cp -i'" >> /etc/profile
@@ -160,10 +160,10 @@
 # Setup configured display manager
 if [ -n "${clst_livecd_xdm}" ]
 then
-	sed -i \
+	gsed -i \
 		-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
 		/etc/rc.conf
-	sed -i \
+	gsed -i \
 		-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
 		/etc/conf.d/xdm
 fi
@@ -171,7 +171,7 @@
 # Setup configured default X Session
 if [ -n "${clst_livecd_xsession}" ]
 then
-	sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \
+	gsed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \
 		/etc/rc.conf
 fi
 
@@ -183,21 +183,21 @@
 	gentoo-release-universal)
 		cat /etc/generic.motd.txt /etc/universal.motd.txt \
 			/etc/minimal.motd.txt > /etc/motd
-		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
+		gsed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
 	;;
 	gentoo-release-minimal)
 		cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
-		sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
+		gsed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
 	;;
 	gentoo-release-live*)
 		cat /etc/generic.motd.txt \
 			/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
-		sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
+		gsed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
 			-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
 	;;
 	gentoo-gamecd)
 		cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
-		sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
+		gsed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
 	;;
 esac
 
@@ -208,7 +208,7 @@
 then
 	if [ -d /etc/splash/${clst_livecd_splash_theme} ]
 	then
-		sed -i \
+		gsed -i \
 			-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
 			-e "/^# SPLASH_TTYS=/ s/^#//" \
 			/etc/conf.d/splash
@@ -248,7 +248,7 @@
 			rm /tmp/gamecd.conf
 
 			# Here we replace out game information into several files
-			sed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd
+			gsed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd
 
 			# Here we setup our xinitrc
 			echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc
@@ -295,7 +295,7 @@
 					/etc/X11/gdm/custom.conf
 			else
 				cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
-				sed -i \
+				gsed -i \
 					-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
 					-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
 					-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \
@@ -305,7 +305,7 @@
 
 				if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
 				then
-					sed -i \
+					gsed -i \
 						-e "s:TimedLogin=:TimedLogin=${first_user}:" \
 						/etc/X11/gdm/gdm.conf
 				fi
@@ -315,7 +315,7 @@
 		# This gives us our list of system packages for the installer
 		mkdir -p /usr/livecd
 		### XXX: Andrew says we don't need this anymore
-		USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
+		USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp system | grep -e '^\[ebuild' | gsed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
 
 		# This is my hack to reduce tmpfs usage
 		cp -r /usr/portage/profiles /usr/livecd
@@ -350,10 +350,10 @@
 						/home/${username}/Desktop
 					cp -f /usr/share/applications/installer-dialog.desktop \
 						/home/${username}/Desktop
-					sed -i -e \
+					gsed -i -e \
 						's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
 						/home/${username}/Desktop/installer-dialog.desktop
-					sed -i -e 's:Exec=installer-gtk:Exec=installer:' \
+					gsed -i -e 's:Exec=installer-gtk:Exec=installer:' \
 						/home/${username}/Desktop/installer-gtk.desktop
 				fi
 				chown -R ${username}:100 /home/${username}
@@ -388,12 +388,12 @@
 # We want the first user to be used when auto-starting X
 if [ -e /etc/startx ]
 then
-	sed -i \
+	gsed -i \
 		"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
 		/root/.bashrc
 fi
 
 if [ -e /lib/rcscripts/addons/udev-start.sh ]
 then
-	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
+	gsed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
 fi