Attachment #425294 for bug #363577

Lines 39-44 confdefaults={ Link Here

(-)a/catalyst-3.0_rc1/catalyst/defaults.py (+1 lines)
39	"PythonDir": "./catalyst",	39	"PythonDir": "./catalyst",
40	"repo_basedir": "/usr",	40	"repo_basedir": "/usr",
41	"repo_name": "portage",	41	"repo_name": "portage",
		42	"sed": "sed",
42	"sharedir": "/usr/share/catalyst",	43	"sharedir": "/usr/share/catalyst",
43	"shdir": "/usr/share/catalyst/targets/",	44	"shdir": "/usr/share/catalyst/targets/",
44	"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",	45	"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",

Lines 343-348 def _main(parser, opts): Link Here

(-)a/catalyst-3.0_rc1/catalyst/main.py (+6 lines)
343	conf_values['compress_definitions'] = COMPRESS_DEFINITIONS	343	conf_values['compress_definitions'] = COMPRESS_DEFINITIONS
344	# TODO add capability to config/spec new definitions	344	# TODO add capability to config/spec new definitions
345		345
		346	# detect GNU sed
		347	for sed in ('/usr/bin/gsed', '/bin/sed', '/usr/bin/sed'):
		348	if os.path.exists(sed):
		349	conf_values["sed"] = sed
		350	break
		351
346	# Start checking that digests are valid now that hash_map is initialized	352	# Start checking that digests are valid now that hash_map is initialized
347	if "digests" in conf_values:	353	if "digests" in conf_values:
348	digests = set(conf_values['digests'].split())	354	digests = set(conf_values['digests'].split())




# First, we drop in a known-good baselayout
[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
run_merge "--oneshot --nodeps sys-apps/baselayout"
${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}

# Now, we install our packages
if [ -e ${clst_make_conf} ]; then

fi

run_merge "--oneshot ${clst_buildpkgs}"
${clst_sed} -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
	${clst_make_conf}
for useexpand in ${clst_HOSTUSEEXPAND}; do
	x="clst_${useexpand}"
	${clst_sed} -i "/${useexpand}=\"${!x}\"/d" \
	${clst_make_conf}
done

Lines 21-25 fi Link Here

(-)a/catalyst-3.0_rc1/targets/stage2/stage2-chroot.sh (-2 / +2 lines)
21	${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} \|\| exit 1	21	${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} \|\| exit 1
22		22
23	# Clean-up USE again	23	# Clean-up USE again
24	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"	24	${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
25	sed -i "/USE=\"bindist\"/d" "${clst_make_conf}"	25	${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"

Lines 79-85 case ${clst_hostarch} in Link Here

(-)a/catalyst-3.0_rc1/targets/support/bootloader-setup.sh (-1 / +1 lines)
79	echo "message=/boot/boot.msg" >> ${icfg}	79	echo "message=/boot/boot.msg" >> ${icfg}
80		80
81	# Here is where I fix up the boot.msg file.	81	# Here is where I fix up the boot.msg file.
82	sed -e 's/ARCH/PowerPC/' \	82	${clst_sed} -e 's/ARCH/PowerPC/' \
83	-e 's/HARDWARE/Apple and IBM hardware/' \	83	-e 's/HARDWARE/Apple and IBM hardware/' \
84	-i $kmsg	84	-i $kmsg
85		85




		else
			clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1
		fi
		${clst_sed} -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}
		mkdir -p /etc/distcc
		echo "${clst_distcc_hosts}" > /etc/distcc/hosts


		echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"
		[ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}"
		run_merge --oneshot --update --newuse sys-apps/portage
		${clst_sed} -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
	else
		run_merge --oneshot --update --newuse sys-apps/portage
	fi


	# Remove bindist from use
	# this is handled independantly in stage2, changes here should be mirrored there
	${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
	${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"

	[ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*
}


make_destpath() {
	# ROOT is / by default, so remove any ROOT= settings from make.conf
	${clst_sed} -i '/ROOT=/d' ${clst_make_conf}
	export ROOT=/
	if [ "${1}" != "/" -a -n "${1}" ]
	then




isoroot_checksum() {
	echo "Creating checksums for all files included in the iso, please wait..."
	find "${clst_target_path}" -type f ! -name 'isoroot_checksums' ! -name 'isolinux.bin' -exec sha512sum {} + > "${clst_target_path}"/isoroot_checksums
	${clst_sed} -i "s#${clst_target_path}##" "${clst_target_path}"/isoroot_checksums
}

run_mkisofs() {

		if [ -f "${clst_target_path}/ppc/bootinfo.txt" ]
		then
			echo "bootinfo.txt found .. updating it"
			${clst_sed} -i -e \
			's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \
			"${clst_target_path}/ppc/bootinfo.txt"
			${clst_sed} -i -e \
			's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
			"${clst_target_path}/ppc/bootinfo.txt"
		fi




		if [ ! "${clst_kextraversion}" = "" ]
		then
			echo "Setting extraversion to ${clst_kextraversion}"
			${clst_sed} -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

	if [ ! "${clst_kextraversion}" = "" ]
	then
		echo "Setting extraversion to ${clst_kextraversion}"
		${clst_sed} -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
	fi
fi




build_kernel
${clst_sed} -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_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 | ${clst_sed} -e "s/EXTRAVERSION =//" -e "s/ //g"`
clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}

unset USE




# Allow root logins to our CD by default
if [ -e /etc/ssh/sshd_config ]
then
	${clst_sed} -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
		/etc/ssh/sshd_config
fi


# Setup sudoers
if [ -f /etc/sudoers ]
then
	${clst_sed} -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
fi

# Setup links for ethernet devices

cat ${clst_make_conf}.old >> ${clst_make_conf}

# devfs tweaks
[ -e /etc/devfsd.conf ] && ${clst_sed} -i '/dev-state/ s:^:#:' /etc/devfsd.conf

# Add some helpful aliases
echo "alias cp='cp -i'" >> /etc/profile

# Setup configured display manager
if [ -n "${clst_livecd_xdm}" ]
then
	${clst_sed} -i \
		-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
		/etc/rc.conf
	${clst_sed} -i \
		-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
		/etc/conf.d/xdm
fi

	gentoo-release-universal)
		cat /etc/generic.motd.txt /etc/universal.motd.txt \
			/etc/minimal.motd.txt > /etc/motd
		${clst_sed} -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
		${clst_sed} -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
		${clst_sed} -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
		${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
	;;
esac


then
	if [ -d /etc/splash/${clst_livecd_splash_theme} ]
	then
		${clst_sed} -i \
			-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
			-e "/^# SPLASH_TTYS=/ s/^#//" \
			/etc/conf.d/splash

			rm /tmp/gamecd.conf

			# Here we replace out game information into several files
			${clst_sed} -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd

			# Here we setup our xinitrc
			echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc

					/etc/X11/gdm/custom.conf
			else
				cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
				${clst_sed} -i \
					-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
					-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
					-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \


				if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
				then
					${clst_sed} -i \
						-e "s:TimedLogin=:TimedLogin=${first_user}:" \
						/etc/X11/gdm/gdm.conf
				fi

		# 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' | ${clst_sed} -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt

		# This is my hack to reduce tmpfs usage
		cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd

						/home/${username}/Desktop
					cp -f /usr/share/applications/installer-dialog.desktop \
						/home/${username}/Desktop
					${clst_sed} -i -e \
						's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
						/home/${username}/Desktop/installer-dialog.desktop
					${clst_sed} -i -e 's:Exec=installer-gtk:Exec=installer:' \
						/home/${username}/Desktop/installer-gtk.desktop
				fi
				chown -R ${username}:100 /home/${username}

# We want the first user to be used when auto-starting X
if [ -e /etc/startx ]
then
	${clst_sed} -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc
fi

if [ -e /lib/rcscripts/addons/udev-start.sh ]
then
	${clst_sed} -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
fi

env-update

Return to bug 363577

Lines 7-13 source /tmp/chroot-functions.sh Link Here

(-)a/catalyst-3.0_rc1/targets/support/livecdfs-update.sh (-18 / +18 lines)
7	# Allow root logins to our CD by default	7	# Allow root logins to our CD by default
8	if [ -e /etc/ssh/sshd_config ]	8	if [ -e /etc/ssh/sshd_config ]
9	then	9	then
10	sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \	10	${clst_sed} -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
11	/etc/ssh/sshd_config	11	/etc/ssh/sshd_config
12	fi	12	fi
13		13
Lines 73-79 fi Link Here
73	# Setup sudoers	73	# Setup sudoers
74	if [ -f /etc/sudoers ]	74	if [ -f /etc/sudoers ]
75	then	75	then
76	sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers	76	${clst_sed} -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
77	fi	77	fi
78		78
79	# Setup links for ethernet devices	79	# Setup links for ethernet devices
Lines 113-119 echo "####################################################" >> ${clst_make_conf} Link Here
113	cat ${clst_make_conf}.old >> ${clst_make_conf}	113	cat ${clst_make_conf}.old >> ${clst_make_conf}
114		114
115	# devfs tweaks	115	# devfs tweaks
116	[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf	116	[ -e /etc/devfsd.conf ] && ${clst_sed} -i '/dev-state/ s:^:#:' /etc/devfsd.conf
117		117
118	# Add some helpful aliases	118	# Add some helpful aliases
119	echo "alias cp='cp -i'" >> /etc/profile	119	echo "alias cp='cp -i'" >> /etc/profile
Lines 153-162 fi Link Here
153	# Setup configured display manager	153	# Setup configured display manager
154	if [ -n "${clst_livecd_xdm}" ]	154	if [ -n "${clst_livecd_xdm}" ]
155	then	155	then
156	sed -i \	156	${clst_sed} -i \
157	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \	157	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
158	/etc/rc.conf	158	/etc/rc.conf
159	sed -i \	159	${clst_sed} -i \
160	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \	160	-e "s:^#\\?DISPLAYMANAGER=.\+$:DISPLAYMANAGER=\"${clst_livecd_xdm}\":" \
161	/etc/conf.d/xdm	161	/etc/conf.d/xdm
162	fi	162	fi
Lines 175-195 case ${clst_livecd_type} in Link Here
175	gentoo-release-universal)	175	gentoo-release-universal)
176	cat /etc/generic.motd.txt /etc/universal.motd.txt \	176	cat /etc/generic.motd.txt /etc/universal.motd.txt \
177	/etc/minimal.motd.txt > /etc/motd	177	/etc/minimal.motd.txt > /etc/motd
178	sed -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd	178	${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux Universal Installation CD!:' /etc/motd
179	;;	179	;;
180	gentoo-release-minimal)	180	gentoo-release-minimal)
181	cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd	181	cat /etc/generic.motd.txt /etc/minimal.motd.txt > /etc/motd
182	sed -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd	182	${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux Minimal Installation CD!:' /etc/motd
183	;;	183	;;
184	gentoo-release-live*)	184	gentoo-release-live*)
185	cat /etc/generic.motd.txt \	185	cat /etc/generic.motd.txt \
186	/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd	186	/etc/minimal.motd.txt /etc/livecd.motd.txt > /etc/motd
187	sed -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \	187	${clst_sed} -i -e 's:^##GREETING:Welcome to the Gentoo Linux LiveCD!:' \
188	-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd	188	-e "s:##DISPLAY_MANAGER:${clst_livecd_xdm}:" /etc/motd
189	;;	189	;;
190	gentoo-gamecd)	190	gentoo-gamecd)
191	cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd	191	cat /etc/generic.motd.txt /etc/gamecd.motd.txt > /etc/motd
192	sed -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd	192	${clst_sed} -i 's:^##GREETING:Welcome to the Gentoo Linux ##GAME_NAME GameCD!:' /etc/motd
193	;;	193	;;
194	esac	194	esac
195		195
Lines 200-206 if [ -n "${clst_livecd_splash_theme}" ] Link Here
200	then	200	then
201	if [ -d /etc/splash/${clst_livecd_splash_theme} ]	201	if [ -d /etc/splash/${clst_livecd_splash_theme} ]
202	then	202	then
203	sed -i \	203	${clst_sed} -i \
204	-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \	204	-e "s:# SPLASH_THEME=\"gentoo\":SPLASH_THEME=\"${clst_livecd_splash_theme}\":" \
205	-e "/^# SPLASH_TTYS=/ s/^#//" \	205	-e "/^# SPLASH_TTYS=/ s/^#//" \
206	/etc/conf.d/splash	206	/etc/conf.d/splash
Lines 229-235 case ${clst_livecd_type} in Link Here
229	rm /tmp/gamecd.conf	229	rm /tmp/gamecd.conf
230		230
231	# Here we replace out game information into several files	231	# Here we replace out game information into several files
232	sed -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd	232	${clst_sed} -i -e "s:##GAME_NAME:${GAME_NAME}:" /etc/motd
233		233
234	# Here we setup our xinitrc	234	# Here we setup our xinitrc
235	echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc	235	echo "exec ${GAME_EXECUTABLE}" > /etc/X11/xinit/xinitrc
Lines 276-282 case ${clst_livecd_type} in Link Here
276	/etc/X11/gdm/custom.conf	276	/etc/X11/gdm/custom.conf
277	else	277	else
278	cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old	278	cp -f /etc/X11/gdm/gdm.conf /etc/X11/gdm/gdm.conf.old
279	sed -i \	279	${clst_sed} -i \
280	-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \	280	-e 's:TimedLoginEnable=false:TimedLoginEnable=true:' \
281	-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \	281	-e 's:TimedLoginDelay=30:TimedLoginDelay=10:' \
282	-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \	282	-e 's:AllowRemoteRoot=true:AllowRemoteRoot=false:' \
Lines 286-292 case ${clst_livecd_type} in Link Here
286		286
287	if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]	287	if [ -n "${clst_livecd_users}" ] && [ -n "${first_user}" ]
288	then	288	then
289	sed -i \	289	${clst_sed} -i \
290	-e "s:TimedLogin=:TimedLogin=${first_user}:" \	290	-e "s:TimedLogin=:TimedLogin=${first_user}:" \
291	/etc/X11/gdm/gdm.conf	291	/etc/X11/gdm/gdm.conf
292	fi	292	fi
Lines 296-302 case ${clst_livecd_type} in Link Here
296	# This gives us our list of system packages for the installer	296	# This gives us our list of system packages for the installer
297	mkdir -p /usr/livecd	297	mkdir -p /usr/livecd
298	### XXX: Andrew says we don't need this anymore	298	### XXX: Andrew says we don't need this anymore
299	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	299	USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system \| grep -e '^\[ebuild' \| ${clst_sed} -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
300		300
301	# This is my hack to reduce tmpfs usage	301	# This is my hack to reduce tmpfs usage
302	cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd	302	cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd
Lines 331-340 case ${clst_livecd_type} in Link Here
331	/home/${username}/Desktop	331	/home/${username}/Desktop
332	cp -f /usr/share/applications/installer-dialog.desktop \	332	cp -f /usr/share/applications/installer-dialog.desktop \
333	/home/${username}/Desktop	333	/home/${username}/Desktop
334	sed -i -e \	334	${clst_sed} -i -e \
335	's:Exec=installer-dialog:Exec=sudo installer-dialog:' \	335	's:Exec=installer-dialog:Exec=sudo installer-dialog:' \
336	/home/${username}/Desktop/installer-dialog.desktop	336	/home/${username}/Desktop/installer-dialog.desktop
337	sed -i -e 's:Exec=installer-gtk:Exec=installer:' \	337	${clst_sed} -i -e 's:Exec=installer-gtk:Exec=installer:' \
338	/home/${username}/Desktop/installer-gtk.desktop	338	/home/${username}/Desktop/installer-gtk.desktop
339	fi	339	fi
340	chown -R ${username}:100 /home/${username}	340	chown -R ${username}:100 /home/${username}
Lines 369-380 esac Link Here
369	# We want the first user to be used when auto-starting X	369	# We want the first user to be used when auto-starting X
370	if [ -e /etc/startx ]	370	if [ -e /etc/startx ]
371	then	371	then
372	sed -i "s:##STARTX:echo startx \| su - '${first_user}':" /root/.bashrc	372	${clst_sed} -i "s:##STARTX:echo startx \| su - '${first_user}':" /root/.bashrc
373	fi	373	fi
374		374
375	if [ -e /lib/rcscripts/addons/udev-start.sh ]	375	if [ -e /lib/rcscripts/addons/udev-start.sh ]
376	then	376	then
377	sed -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh	377	${clst_sed} -i "s:\t\[\[ -x /sbin/evms_activate:\t\[\[ -x \${CDBOOT} \]\] \&\& \[\[ -x /sbin/evms_activate:" /lib/rcscripts/addons/udev-start.sh
378	fi	378	fi
379		379
380	env-update	380	env-update

Lines 49-55 make_destpath /tmp/stage1root Link Here

(-)a/catalyst-3.0_rc1/targets/stage1/stage1-chroot.sh (-3 / +3 lines)
49	# First, we drop in a known-good baselayout	49	# First, we drop in a known-good baselayout
50	[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}	50	[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
51	run_merge "--oneshot --nodeps sys-apps/baselayout"	51	run_merge "--oneshot --nodeps sys-apps/baselayout"
52	sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}	52	${clst_sed} -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
53		53
54	# Now, we install our packages	54	# Now, we install our packages
55	if [ -e ${clst_make_conf} ]; then	55	if [ -e ${clst_make_conf} ]; then
Lines 62-71 if [ -e ${clst_make_conf} ]; then Link Here
62	fi	62	fi
63		63
64	run_merge "--oneshot ${clst_buildpkgs}"	64	run_merge "--oneshot ${clst_buildpkgs}"
65	sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \	65	${clst_sed} -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
66	${clst_make_conf}	66	${clst_make_conf}
67	for useexpand in ${clst_HOSTUSEEXPAND}; do	67	for useexpand in ${clst_HOSTUSEEXPAND}; do
68	x="clst_${useexpand}"	68	x="clst_${useexpand}"
69	sed -i "/${useexpand}=\"${!x}\"/d" \	69	${clst_sed} -i "/${useexpand}=\"${!x}\"/d" \
70	${clst_make_conf}	70	${clst_make_conf}
71	done	71	done

Lines 87-93 setup_myfeatures(){ Link Here

(-)a/catalyst-3.0_rc1/targets/support/chroot-functions.sh (-5 / +5 lines)
87	else	87	else
88	clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc \|\| exit 1	88	clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc \|\| exit 1
89	fi	89	fi
90	sed -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}	90	${clst_sed} -i '/USE="${USE} -avahi -gtk -gnome"/d' ${clst_make_conf}
91	mkdir -p /etc/distcc	91	mkdir -p /etc/distcc
92	echo "${clst_distcc_hosts}" > /etc/distcc/hosts	92	echo "${clst_distcc_hosts}" > /etc/distcc/hosts
93		93
Lines 186-192 setup_pkgmgr(){ Link Here
186	echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"	186	echo "Adding USE=\"\${USE} $1\" to make.conf for portage build"
187	[ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}"	187	[ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}"
188	run_merge --oneshot --update --newuse sys-apps/portage	188	run_merge --oneshot --update --newuse sys-apps/portage
189	sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"	189	${clst_sed} -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
190	else	190	else
191	run_merge --oneshot --update --newuse sys-apps/portage	191	run_merge --oneshot --update --newuse sys-apps/portage
192	fi	192	fi
Lines 241-248 cleanup_stages() { Link Here
241		241
242	# Remove bindist from use	242	# Remove bindist from use
243	# this is handled independantly in stage2, changes here should be mirrored there	243	# this is handled independantly in stage2, changes here should be mirrored there
244	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"	244	${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
245	sed -i "/USE=\"bindist\"/d" "${clst_make_conf}"	245	${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"
246		246
247	[ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*	247	[ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*
248	}	248	}
Lines 260-266 die() { Link Here
260		260
261	make_destpath() {	261	make_destpath() {
262	# ROOT is / by default, so remove any ROOT= settings from make.conf	262	# ROOT is / by default, so remove any ROOT= settings from make.conf
263	sed -i '/ROOT=/d' ${clst_make_conf}	263	${clst_sed} -i '/ROOT=/d' ${clst_make_conf}
264	export ROOT=/	264	export ROOT=/
265	if [ "${1}" != "/" -a -n "${1}" ]	265	if [ "${1}" != "/" -a -n "${1}" ]
266	then	266	then

Lines 87-93 fi Link Here

(-)a/catalyst-3.0_rc1/targets/support/create-iso.sh (-3 / +3 lines)
87	isoroot_checksum() {	87	isoroot_checksum() {
88	echo "Creating checksums for all files included in the iso, please wait..."	88	echo "Creating checksums for all files included in the iso, please wait..."
89	find "${clst_target_path}" -type f ! -name 'isoroot_checksums' ! -name 'isolinux.bin' -exec sha512sum {} + > "${clst_target_path}"/isoroot_checksums	89	find "${clst_target_path}" -type f ! -name 'isoroot_checksums' ! -name 'isolinux.bin' -exec sha512sum {} + > "${clst_target_path}"/isoroot_checksums
90	sed -i "s#${clst_target_path}##" "${clst_target_path}"/isoroot_checksums	90	${clst_sed} -i "s#${clst_target_path}##" "${clst_target_path}"/isoroot_checksums
91	}	91	}
92		92
93	run_mkisofs() {	93	run_mkisofs() {
Lines 203-212 case ${clst_hostarch} in Link Here
203	if [ -f "${clst_target_path}/ppc/bootinfo.txt" ]	203	if [ -f "${clst_target_path}/ppc/bootinfo.txt" ]
204	then	204	then
205	echo "bootinfo.txt found .. updating it"	205	echo "bootinfo.txt found .. updating it"
206	sed -i -e \	206	${clst_sed} -i -e \
207	's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \	207	's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \
208	"${clst_target_path}/ppc/bootinfo.txt"	208	"${clst_target_path}/ppc/bootinfo.txt"
209	sed -i -e \	209	${clst_sed} -i -e \
210	's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \	210	's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
211	"${clst_target_path}/ppc/bootinfo.txt"	211	"${clst_target_path}/ppc/bootinfo.txt"
212	fi	212	fi

Lines 245-251 then Link Here

(-)a/catalyst-3.0_rc1/targets/support/kmerge.sh (-4 / +4 lines)
245	if [ ! "${clst_kextraversion}" = "" ]	245	if [ ! "${clst_kextraversion}" = "" ]
246	then	246	then
247	echo "Setting extraversion to ${clst_kextraversion}"	247	echo "Setting extraversion to ${clst_kextraversion}"
248	sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile	248	${clst_sed} -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
249	echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION	249	echo ${clst_kextraversion} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
250	else	250	else
251	touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION	251	touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
Lines 262-268 $(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2 Link Here
262	if [ ! "${clst_kextraversion}" = "" ]	262	if [ ! "${clst_kextraversion}" = "" ]
263	then	263	then
264	echo "Setting extraversion to ${clst_kextraversion}"	264	echo "Setting extraversion to ${clst_kextraversion}"
265	sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile	265	${clst_sed} -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
266	fi	266	fi
267	fi	267	fi
268		268
Lines 275-286 make_destpath Link Here
275		275
276		276
277	build_kernel	277	build_kernel
278	sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}	278	${clst_sed} -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}
279	# grep out the kernel version so that we can do our modules magic	279	# grep out the kernel version so that we can do our modules magic
280	VER=`grep ^VERSION\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`	280	VER=`grep ^VERSION\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`
281	PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`	281	PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`
282	SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`	282	SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile \| awk '{ print $3 };'`
283	EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile \| sed -e "s/EXTRAVERSION =//" -e "s/ //g"`	283	EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile \| ${clst_sed} -e "s/EXTRAVERSION =//" -e "s/ //g"`
284	clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}	284	clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
285		285
286	unset USE	286	unset USE