[gentoo-commits] proj/catalyst:master commit in: targets/support/

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     dacde1f4c05d6a5771ed9cb00480b57a2f6eec59
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 18:15:35 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 21:42:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dacde1f4

boot from local hd if no response to boot menu

x-gentoo-bug: 141199
x-gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=141199
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>

---
 targets/support/bootloader-setup.sh |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index ffd6794..6f39196 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -257,6 +257,7 @@ case ${clst_hostarch} in
 			kmsg=$1/isolinux/kernels.msg
 			echo "default ${first}" > ${icfg}
 			echo "timeout 150" >> ${icfg}
+			echo "ontimeout localhost" >> ${icfg}
 			echo "prompt 1" >> ${icfg}
 			echo "display boot.msg" >> ${icfg}
 			echo "F1 kernels.msg" >> ${icfg}
@@ -319,6 +320,10 @@ case ${clst_hostarch} in
 				echo "label memtest86" >> $icfg
 				echo "  kernel memtest86" >> $icfg
 			fi
+			echo >> $icfg
+			echo "label localhost" >> $icfg
+			echo "  localboot -1" >> $icfg
+			echo "  MENU HIDE" >> $icfg
 		fi
 
 		if [ -e $1/boot/efi/elilo.efi ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     dcab29a00587d33f509cae8856e38ee0c51f2313
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 00:45:48 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 00:46:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dcab29a0

Add /etc/init.d/fixinittab to the default runlevel - fix autologin on the installcd.

---
 targets/support/rc-update.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index dc5ee71..743ae7a 100644
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -24,6 +24,7 @@ then
 	[[ -e /etc/init.d/sysklogd ]] && rc-update add sysklogd default
 	[[ -e /etc/init.d/metalog ]] && rc-update add metalog default
 	[[ -e /etc/init.d/syslog-ng ]] && rc-update add syslog-ng default
+	[[ -e /etc/init.d/fixinittab ]] && rc-update add fixinittab default
 
 	# Do some livecd_type specific rc-update changes
 	case ${clst_livecd_type} in

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     0615417abfc725592fc0a89faa8741cc193a316a
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Sep  1 23:08:04 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Sep  1 23:21:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0615417a

Set FEATURES=-news before emerging ccache/distcc/icecream

---
 targets/support/chroot-functions.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 638ef67..b19ce9a 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -61,6 +61,7 @@ get_libdir() {
 
 setup_myfeatures(){
 	setup_myemergeopts
+	export FEATURES="-news"
 	if [ -n "${clst_CCACHE}" ]
 	then
 		export clst_myfeatures="${clst_myfeatures} ccache"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     f23b1243fc6ee43612633723ff2d0d92870bce51
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 07:09:24 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 07:09:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f23b1243

Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing the issue.

---
 targets/support/chroot-functions.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index c454aaf..af693e8 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -165,8 +165,9 @@ setup_pkgmgr(){
 	# We need to merge our package manager with USE="build" set in case it is
 	# portage to avoid frying our /etc/make.conf file.  Otherwise, we could
 	# just let emerge system could merge it.
+	# Use --update or portage won't reinstall the same version.
 	[ -e /etc/make.conf ] && echo 'USE="${USE} build"' >> /etc/make.conf
-	run_merge --oneshot --nodeps sys-apps/portage
+	run_merge --oneshot --nodeps --update sys-apps/portage
 	sed -i '/USE="${USE} build"/d' /etc/make.conf
 }
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     516e42d4bf791aef6d73b99974c3844d4d07471e
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 02:34:56 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 02:34:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=516e42d4

Replace --with-bdeps=n with --with-bdeps=y for depclean.

---
 targets/support/chroot-functions.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index af693e8..a10c1fa 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -202,7 +202,7 @@ cleanup_stages() {
 	fi
 	case ${clst_target} in
 		stage3|system)
-			run_merge --depclean --with-bdeps=n
+			run_merge --depclean --with-bdeps=y
 			;;
 		*)
 			echo "Skipping depclean operation for ${clst_target}"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     75a250a1bef09901640dc579fdc7cb6be341f078
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 01:03:58 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 01:03:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=75a250a1

Whitespace.

---
 targets/support/bootloader-setup.sh  |   22 +++++++++++-----------
 targets/support/chroot-functions.sh  |    9 ++++-----
 targets/support/create-iso.sh        |    4 ++--
 targets/support/functions.sh         |   18 +++++++++---------
 targets/support/kill-chroot-pids.sh  |   10 +++++-----
 targets/support/kmerge.sh            |   18 +++++++++---------
 targets/support/livecdfs-update.sh   |    2 +-
 targets/support/mips-arcload_conf.sh |    2 +-
 targets/support/rc-update.sh         |    1 -
 9 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 59f1abe..2fa44e0 100644
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -64,27 +64,27 @@ case ${clst_hostarch} in
 		echo "fgcolor=white" >> ${icfg}
 		echo "bgcolor=black" >> ${icfg}
 		echo "message=/boot/boot.msg" >> ${icfg}
-		
+
 		# Here is where I fix up the boot.msg file.
 		sed -e 's/ARCH/PowerPC/' \
 			-e 's/HARDWARE/Apple and IBM hardware/' \
 			-i $kmsg
 
-		# Setup the IBM yaboot.conf	
+		# Setup the IBM yaboot.conf
 		etc_icfg=$1/etc/yaboot.conf
-		mkdir -p $1/etc	
+		mkdir -p $1/etc
 		IBM_YABOOT="FALSE"
 		echo "root=/dev/ram" >> ${etc_icfg}
 		echo "fgcolor=white" >> ${etc_icfg}
 		echo "bgcolor=black" >> ${etc_icfg}
 		echo "message=/boot/boot.msg" >> ${etc_icfg}
-		
+
 		for x in ${clst_boot_kernel}
-		do	
+		do
 			eval "clst_kernel_console=\$clst_boot_kernel_${x}_console"
 			eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type"
 			eval custom_kopts=\$${x}_kernelopts
-				
+
 			echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
 			if [ "${clst_kernel_machine_type}" == "ibm" ]
 			then
@@ -147,7 +147,7 @@ case ${clst_hostarch} in
 					echo "label=${x}" >> ${icfg}
 					echo "read-write" >> ${icfg}
 					echo "append=\"${default_append_line}\"" >> ${icfg}
-					
+
 					for y in ${clst_kernel_console}
 					do
 						echo >> ${icfg}
@@ -179,7 +179,7 @@ case ${clst_hostarch} in
 		done
 
 		if [ "${IBM_YABOOT}" == "FALSE" ]
-		then 
+		then
 			rm ${etc_kmsg}
 			rmdir $1/etc
 			if [ -d $1/ppc ]
@@ -280,7 +280,7 @@ case ${clst_hostarch} in
 				eval custom_kopts=\$${x}_kernelopts
 				echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
 				echo >> ${icfg}
-				
+
 				eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel"
 
 				if [ -n "${clst_kernel_softlevel}" ]
@@ -375,9 +375,9 @@ case ${clst_hostarch} in
 				eval custom_kopts=\$${x}_kernelopts
 				echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
 				echo >> ${icfg}
-				
+
 				eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel"
-				
+
 				if [ -n "${clst_kernel_softlevel}" ]
 				then
 					for y in ${clst_kernel_softlevel}

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 78db5ec..12597a3 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -251,8 +251,8 @@ run_merge() {
 	# Sets up the ROOT= parameter
 	# with no options ROOT=/
 	make_destpath ${clst_root_path}
-	
-	export EMERGE_WARNING_DELAY=0 	
+
+	export EMERGE_WARNING_DELAY=0
 	export CLEAN_DELAY=0
 	export EBEEP_IGNORE=0
 	export EPAUSE_IGNORE=0
@@ -349,7 +349,7 @@ function copy_symlink() {
 	STACK=${2}
 	[ "${STACK}" = "" ] && STACK=16 || STACK=$((${STACK} - 1 ))
 
-	if [ ${STACK} -le 0 ] 
+	if [ ${STACK} -le 0 ]
 	then
 		echo "WARNING : ${TARGET} : too many levels of symbolic links !"
 		return
@@ -359,7 +359,7 @@ function copy_symlink() {
 		mkdir -p ${clst_root_path}/`dirname ${1}`
 	[ ! -e ${clst_root_path}/${1} ] && \
 		cp -vfdp ${1} ${clst_root_path}/${1}
-	
+
 	if [[ -n $(type -p realpath) ]]; then
 		TARGET=`realpath ${1}`
 	else
@@ -412,4 +412,3 @@ Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
 
 # We do this everywhere, so why not put it in this script
 run_default_funcs
-

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index c525a39..06a1a75 100644
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -284,8 +284,8 @@ case ${clst_hostarch} in
 		then
 			echo 'Creating ISO using EFI bootloader'
 			echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}" 
-			mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image" 
-		else	
+			mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path} || die "Cannot make ISO image"
+		else
 			echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
 			mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 		fi

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 429485b..0bc5d69 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -37,14 +37,14 @@ exec_in_chroot(){
 		chroot_path=${clst_chroot_path}${subdir}
 		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
 			${subdir}/tmp/
-		echo "Running ${file_name} in chroot ${chroot_path}" 
+		echo "Running ${file_name} in chroot ${chroot_path}"
 		${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1
 	else
 		copy_to_chroot ${1} tmp/
 		chroot_path=${clst_chroot_path}
 		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
 			tmp/
-		echo "Running ${file_name} in chroot ${chroot_path}" 
+		echo "Running ${file_name} in chroot ${chroot_path}"
 		${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1
 	fi
 
@@ -97,12 +97,12 @@ extract_kernels() {
 
 		[ ! -e "${kbinary}" ] && die "Can't find kernel tarball at ${kbinary}"
 		mkdir -p ${1}/
-		tar xjf ${kbinary} -C ${1}/ 
+		tar xjf ${kbinary} -C ${1}/
 
 		# change config name from "config-*" to "gentoo", for example
 		#mv ${1}/config-* ${1}/${x}-config
-		rm ${1}/config-* 
-		
+		rm ${1}/config-*
+
 		# change kernel name from "kernel" to "gentoo", for example
 		if [ -e ${1}/kernel-* ]
 		then
@@ -117,12 +117,12 @@ extract_kernels() {
 
 		# change initrd name from "initrd" to "gentoo.igz", for example
 		if [ -e ${1}/initrd-* ]
-		then 
+		then
 			mv ${1}/initrd-* ${1}/${x}.igz
 		fi
 
 		if [ -e ${1}/initramfs-* ]
-		then 
+		then
 			mv ${1}/initramfs-* ${1}/${x}.igz
 		fi
 
@@ -135,7 +135,7 @@ extract_kernels() {
 
 extract_modules() {
 	# $1 = Destination
-	# $2 = kname	
+	# $2 = kname
 	kmodules="${clst_chroot_path}/tmp/kerncache/${2}-modules-${clst_version_stamp}.tar.bz2"
 
 	if [ -f "${kmodules}" ]
@@ -208,7 +208,7 @@ check_filesystem_type(){
 			cmdline_opts="${cmdline_opts} looptype=cramfs loop=/image.cramfs"
 		;;
 	esac
-}																												
+}
 
 run_crossdev() {
 	crossdev ${clst_CHOST}

diff --git a/targets/support/kill-chroot-pids.sh b/targets/support/kill-chroot-pids.sh
index 9e8bf01..ea8ee40 100644
--- a/targets/support/kill-chroot-pids.sh
+++ b/targets/support/kill-chroot-pids.sh
@@ -41,17 +41,17 @@ then
 	echo
 	echo "Killing process(es)"
 	echo "pid: process name"
-	for pid in ${pids[@]} 
-	do 
+	for pid in ${pids[@]}
+	do
 		P_NAME=$(ls -la --color=never /proc/${pid} 2>&1 |grep exe|grep ${clst_chroot_path}|awk '{print $11}')
 		echo ${pid}: ${P_NAME}
 	done
-	echo 
+	echo
 	echo "Press Ctrl-C within 10 seconds to abort"
-	
+
 	sleep 10
 
-	for pid in ${pids[@]} 
+	for pid in ${pids[@]}
 	do
 		kill -9 ${pid}
 	done

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index f57508f..b731373 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -49,7 +49,7 @@ setup_gk_args() {
 	then
 		GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc"
 	fi
-	
+
 	if [ -n "${clst_linuxrc}" ]
 	then
 		GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
@@ -77,7 +77,7 @@ genkernel_compile(){
 
 	setup_gk_args
 	#echo "The GK_ARGS are"
-	#echo ${GK_ARGS}	
+	#echo ${GK_ARGS}
 	export clst_kernel_merge
 	export clst_initramfs_overlay
 	# Build our list of kernel packages
@@ -141,15 +141,15 @@ fi
 # USE variables (and thus different patches enabled/disabled.) Also, there's no
 # real benefit in using the pkgcache for kernel source ebuilds.
 
-USE_MATCH=0 
+USE_MATCH=0
 if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
 then
 	STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
 	STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
 	if [ "${STR1}" = "${STR2}" ]
-	then 
+	then
 		#echo "USE Flags match"
-		USE_MATCH=1 
+		USE_MATCH=1
 	else
 		if [ -n "${clst_KERNCACHE}" ]
 		then
@@ -167,7 +167,7 @@ then
 	STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
 	STR2=${clst_kextraversion}
 	if [ "${STR1}" = "${STR2}" ]
-	then 
+	then
 		if [ -n "${clst_KERNCACHE}" ]
 		then
 			#echo "EXTRAVERSION match"
@@ -182,7 +182,7 @@ then
 	STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
 	STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
 	if [ "${STR1}" = "${STR2}" ]
-	then 
+	then
 		if [ -n "${clst_KERNCACHE}" ]
 		then
 			#echo "CONFIG match"
@@ -204,7 +204,7 @@ then
 		mkdir -p /etc/portage/profile
 		echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
 	else
-		if ( ! grep -q "^${KERNELVERSION}\$"  /etc/portage/profile/package.provided ) 
+		if ( ! grep -q "^${KERNELVERSION}\$"  /etc/portage/profile/package.provided )
 		then
 			echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
 		fi
@@ -226,7 +226,7 @@ then
 		echo "Setting extraversion to ${clst_kextraversion}"
 		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 
+	else
 		touch /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION
 	fi
 fi

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a7aad5f..2b41bf6 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -178,7 +178,7 @@ fi
 # touch /etc/asound.state
 touch /etc/asound.state
 
-# Tweak the MOTD for Gentoo releases 
+# Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
 	gentoo-release-universal)
 		cat /etc/generic.motd.txt /etc/universal.motd.txt \

diff --git a/targets/support/mips-arcload_conf.sh b/targets/support/mips-arcload_conf.sh
index 29692b4..cecddd9 100644
--- a/targets/support/mips-arcload_conf.sh
+++ b/targets/support/mips-arcload_conf.sh
@@ -37,7 +37,7 @@ serial="serial {\n\
 dbg="debug {\n\
 \tdescription\t\"Debug Shell\";\n\
 \timage\t\t\"\";\n\
-\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n"		
+\tappend\t\t\"real_root=shell\" \"nox\";\n}\n\n"
 
 cmt1="comment\t\t\"\\\n\\\n\";\n\
 comment\t\t\"Bootable Images & Options:\\\n\\\r\\\n\\\r\";\n"

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index 50c1da2..c3e8ed9 100644
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -66,4 +66,3 @@ then
 		done
 	fi
 fi
-

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     90c03f9dc255ba89849e46490f9ead7ab3921950
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 02:57:06 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 02:57:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=90c03f9d

Set the profile by calling eselect.

---
 targets/support/chroot-functions.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 12597a3..4da932f 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Set the profile
+eselect profile set ${clst_target_profile}
+
 # Trap these signals and kill ourselves if recieved
 # Force ourselves to die if any of these signals are recieved
 # most likely our controlling terminal is gone

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     72f6115834b157c2cfd1abbd90b2ec2b95f2d60e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 26 00:14:43 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 28 01:23:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=72f61158

Don't emerge ccache/distcc/icecream with --nodeps

ccache-3.1.8 changed to using tar.xz sources, which exposed a problem in
catalyst where an old stage without xz would fail to seed a new stage
using ccache.

ccache's dependencies are zlib (and xz for >=ccache-3.1.8). distcc's are
already part of stages: dev-libs/popt, virtual/pkgconfig, and
sys-devel/gcc-config. icecream has no dependencies (???).

Emerging with --nodeps only has the potential to cause problems.

---
 targets/support/chroot-functions.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 18e7a38..fecbad4 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -68,7 +68,7 @@ setup_myfeatures(){
 	if [ -n "${clst_CCACHE}" ]
 	then
 		export clst_myfeatures="${clst_myfeatures} ccache"
-		clst_root_path=/ run_merge --oneshot --nodeps --noreplace dev-util/ccache || exit 1
+		clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1
 	fi
 
 	if [ -n "${clst_DISTCC}" ]
@@ -83,9 +83,9 @@ setup_myfeatures(){
 		# reinstall if it isn't found.
 		if [ "$(getent passwd distcc | cut -d: -f1)" != "distcc" ]
 		then
-			clst_root_path=/ run_merge --oneshot --nodeps sys-devel/distcc || exit 1
+			clst_root_path=/ run_merge --oneshot sys-devel/distcc || exit 1
 		else
-			clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/distcc || exit 1
+			clst_root_path=/ run_merge --oneshot --noreplace sys-devel/distcc || exit 1
 		fi
 		sed -i '/USE="${USE} -avahi -gtk -gnome"/d' /etc/portage/make.conf
 		mkdir -p /etc/distcc
@@ -104,7 +104,7 @@ setup_myfeatures(){
 
 	if [ -n "${clst_ICECREAM}" ]
 	then
-		clst_root_path=/ run_merge --oneshot --nodeps --noreplace sys-devel/icecream || exit 1
+		clst_root_path=/ run_merge --oneshot --noreplace sys-devel/icecream || exit 1
 
 		# This sets up automatic cross-icecc-fu according to
 		# http://gentoo-wiki.com/HOWTO_Setup_An_ICECREAM_Compile_Cluster#Icecream_and_cross-compiling

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     c57b514c2295df27eafe57dfb1452b486e9c547b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 22:22:22 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 22:28:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c57b514c

Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252.

---
 targets/support/functions.sh |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 0bc5d69..4ccad4c 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,19 +1,8 @@
-copy_to_chroot(){
-	local file_name=$(basename ${1})
-	local dest_dir=${clst_chroot_path}${2}
-	if [ "${2}" != "" ]
-	then
-		echo "copying ${file_name} to ${dest_dir}"
-		mkdir -p ${dest_dir}
-		cp -pPR ${1} ${dest_dir}
-		[ "${file_name}" != "make.profile" ] && \
-			chmod 755 ${dest_dir}/${file_name}
-	else
-		echo "copying ${file_name} to ${clst_chroot_path}/tmp"
-		mkdir -p ${chroot_path}/tmp
-		cp -pPR ${1} ${clst_chroot_path}/tmp
-		chmod 755 ${clst_chroot_path}/tmp/${file_name}
-	fi
+copy_to_chroot() {
+	local src_file=$1
+	local dest_dir=${clst_chroot_path}${2:-/tmp}
+	echo "copying ${src_file##*/} to ${dest_dir}"
+	cp -pPR "${src_file}" "${dest_dir}"/
 }
 
 delete_from_chroot(){

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     17b34223a4afc1f070ac2fb9bdfb51e47c03db61
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 30 22:27:29 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Sep 30 22:28:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=17b34223

Make sure we have ${destdir} on copy_to_chroot and simplify exec_in_chroot.

---
 targets/support/functions.sh |   42 ++++++++++++++----------------------------
 1 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 4ccad4c..60ad249 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,6 +1,7 @@
 copy_to_chroot() {
 	local src_file=$1
 	local dest_dir=${clst_chroot_path}${2:-/tmp}
+	mkdir -p ${dest_dir}
 	echo "copying ${src_file##*/} to ${dest_dir}"
 	cp -pPR "${src_file}" "${dest_dir}"/
 }
@@ -18,34 +19,19 @@ exec_in_chroot(){
 # copies the file to the /tmp directory of the chroot
 # and executes it.
 	local file_name=$(basename ${1})
-	local subdir=${2#/}
-
-	if [ "${subdir}" != "" ]
-	then
-		copy_to_chroot ${1} ${subdir}/tmp/
-		chroot_path=${clst_chroot_path}${subdir}
-		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
-			${subdir}/tmp/
-		echo "Running ${file_name} in chroot ${chroot_path}"
-		${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1
-	else
-		copy_to_chroot ${1} tmp/
-		chroot_path=${clst_chroot_path}
-		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
-			tmp/
-		echo "Running ${file_name} in chroot ${chroot_path}"
-		${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1
-	fi
-
-	rm -f ${chroot_path}/tmp/${file_name}
-	if [ "${subdir}" != "" ]
-	then
-		delete_from_chroot ${subdir}/tmp/${file_name}
-		delete_from_chroot ${subdir}/tmp/chroot-functions.sh
-	else
-		delete_from_chroot tmp/chroot-functions.sh
-		delete_from_chroot tmp/${file_name}
-	fi
+	local subdir=${2}
+	local destdir=${subdir}/tmp
+	destdir=${destdir#/}
+
+	copy_to_chroot ${1} ${destdir}
+	chroot_path=${clst_chroot_path}${subdir}
+	copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+		${destdir}
+	echo "Running ${file_name} in chroot ${chroot_path}"
+	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+
+	delete_from_chroot ${destdir}/${file_name}
+	delete_from_chroot ${destdir}/chroot-functions.sh
 }
 
 #return codes

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     7be5b3b53cd0f89f954845ea9fd885a73cc0aedc
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  1 11:09:39 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Oct  1 11:09:39 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7be5b3b5

Use relative path.

---
 targets/support/functions.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 60ad249..4018716 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -20,8 +20,7 @@ exec_in_chroot(){
 # and executes it.
 	local file_name=$(basename ${1})
 	local subdir=${2}
-	local destdir=${subdir}/tmp
-	destdir=${destdir#/}
+	local destdir=".${subdir}/tmp"
 
 	copy_to_chroot ${1} ${destdir}
 	chroot_path=${clst_chroot_path}${subdir}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     1e49d720b70c27a14a61b961d1225f18e9291a27
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 02:44:00 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 02:44:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1e49d720

Fix the breakage of /lib on amd64 caused by tar replacing the symlink with a dir.

---
 targets/support/functions.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 4018716..d0737a6 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -115,7 +115,7 @@ extract_modules() {
 	if [ -f "${kmodules}" ]
 	then
 		mkdir -p ${1}/
-		tar xjf ${kmodules} -C ${1} lib
+		tar xjf ${kmodules} --strip-components 1 -C ${1}/lib lib
 	else
 		echo "Can't find kernel modules tarball at ${kmodules}.  Skipping...."
 	fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     5ba83b9ac2c024866b9c221fc5026669f769cd32
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 23:59:36 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 23:59:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5ba83b9a

Revert "Use relative path."

This reverts commit 7be5b3b53cd0f89f954845ea9fd885a73cc0aedc.

---
 targets/support/functions.sh |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index d362ece..af57c10 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -20,7 +20,8 @@ exec_in_chroot(){
 # and executes it.
 	local file_name=$(basename ${1})
 	local subdir=${2}
-	local destdir=".${subdir}/tmp"
+	local destdir=${subdir}/tmp
+	destdir=${destdir#/}
 
 	copy_to_chroot ${1} ${destdir}
 	chroot_path=${clst_chroot_path}${subdir}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     64c1787ab549a95c7350fd03c2a22c5f6a073b19
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 23:59:50 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 23:59:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=64c1787a

Revert "Make sure we have ${destdir} on copy_to_chroot and simplify exec_in_chroot."

This reverts commit 17b34223a4afc1f070ac2fb9bdfb51e47c03db61.

---
 targets/support/functions.sh |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index af57c10..a0eaae2 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,7 +1,6 @@
 copy_to_chroot() {
 	local src_file=$1
 	local dest_dir=${clst_chroot_path}${2:-/tmp}
-	mkdir -p ${dest_dir}
 	echo "copying ${src_file##*/} to ${dest_dir}"
 	cp -pPR "${src_file}" "${dest_dir}"/
 }
@@ -19,19 +18,34 @@ exec_in_chroot(){
 # copies the file to the /tmp directory of the chroot
 # and executes it.
 	local file_name=$(basename ${1})
-	local subdir=${2}
-	local destdir=${subdir}/tmp
-	destdir=${destdir#/}
-
-	copy_to_chroot ${1} ${destdir}
-	chroot_path=${clst_chroot_path}${subdir}
-	copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
-		${destdir}
-	echo "Running ${file_name} in chroot ${chroot_path}"
-	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
-
-	delete_from_chroot ${destdir}/${file_name}
-	delete_from_chroot ${destdir}/chroot-functions.sh
+	local subdir=${2#/}
+
+	if [ "${subdir}" != "" ]
+	then
+		copy_to_chroot ${1} ${subdir}/tmp/
+		chroot_path=${clst_chroot_path}${subdir}
+		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+			${subdir}/tmp/
+		echo "Running ${file_name} in chroot ${chroot_path}"
+		${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1
+	else
+		copy_to_chroot ${1} tmp/
+		chroot_path=${clst_chroot_path}
+		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+			tmp/
+		echo "Running ${file_name} in chroot ${chroot_path}"
+		${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1
+	fi
+
+	rm -f ${chroot_path}/tmp/${file_name}
+	if [ "${subdir}" != "" ]
+	then
+		delete_from_chroot ${subdir}/tmp/${file_name}
+		delete_from_chroot ${subdir}/tmp/chroot-functions.sh
+	else
+		delete_from_chroot tmp/chroot-functions.sh
+		delete_from_chroot tmp/${file_name}
+	fi
 }
 
 #return codes

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     3757d1f33bb04e5eabcfb0de714680b23ba64214
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:00:09 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:00:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3757d1f3

Revert "Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252."

This reverts commit c57b514c2295df27eafe57dfb1452b486e9c547b.

---
 targets/support/functions.sh |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index a0eaae2..cb70bdd 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,8 +1,19 @@
-copy_to_chroot() {
-	local src_file=$1
-	local dest_dir=${clst_chroot_path}${2:-/tmp}
-	echo "copying ${src_file##*/} to ${dest_dir}"
-	cp -pPR "${src_file}" "${dest_dir}"/
+copy_to_chroot(){
+	local file_name=$(basename ${1})
+	local dest_dir=${clst_chroot_path}${2}
+	if [ "${2}" != "" ]
+	then
+		echo "copying ${file_name} to ${dest_dir}"
+		mkdir -p ${dest_dir}
+		cp -pPR ${1} ${dest_dir}
+		[ "${file_name}" != "make.profile" ] && \
+			chmod 755 ${dest_dir}/${file_name}
+	else
+		echo "copying ${file_name} to ${clst_chroot_path}/tmp"
+		mkdir -p ${chroot_path}/tmp
+		cp -pPR ${1} ${clst_chroot_path}/tmp
+		chmod 755 ${clst_chroot_path}/tmp/${file_name}
+	fi
 }
 
 delete_from_chroot(){

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     9ca68bf59dfa62b160ba29a6ac3ea5270744d48a
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:56:56 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:56:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ca68bf5

RE-Apply Mike's suggested patch to fix the setting of +x on copy_to_chroot - bug 434252.

---
 targets/support/functions.sh |   21 +++++----------------
 1 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index cb70bdd..a0eaae2 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,19 +1,8 @@
-copy_to_chroot(){
-	local file_name=$(basename ${1})
-	local dest_dir=${clst_chroot_path}${2}
-	if [ "${2}" != "" ]
-	then
-		echo "copying ${file_name} to ${dest_dir}"
-		mkdir -p ${dest_dir}
-		cp -pPR ${1} ${dest_dir}
-		[ "${file_name}" != "make.profile" ] && \
-			chmod 755 ${dest_dir}/${file_name}
-	else
-		echo "copying ${file_name} to ${clst_chroot_path}/tmp"
-		mkdir -p ${chroot_path}/tmp
-		cp -pPR ${1} ${clst_chroot_path}/tmp
-		chmod 755 ${clst_chroot_path}/tmp/${file_name}
-	fi
+copy_to_chroot() {
+	local src_file=$1
+	local dest_dir=${clst_chroot_path}${2:-/tmp}
+	echo "copying ${src_file##*/} to ${dest_dir}"
+	cp -pPR "${src_file}" "${dest_dir}"/
 }
 
 delete_from_chroot(){

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     dade88d142906122e485794664e5892504f45fc2
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:57:44 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:57:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dade88d1

re-apply "Make sure we have ${destdir} on copy_to_chroot and simplify exec_in_chroot.""

---
 targets/support/functions.sh |   42 ++++++++++++++----------------------------
 1 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index a0eaae2..af57c10 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,6 +1,7 @@
 copy_to_chroot() {
 	local src_file=$1
 	local dest_dir=${clst_chroot_path}${2:-/tmp}
+	mkdir -p ${dest_dir}
 	echo "copying ${src_file##*/} to ${dest_dir}"
 	cp -pPR "${src_file}" "${dest_dir}"/
 }
@@ -18,34 +19,19 @@ exec_in_chroot(){
 # copies the file to the /tmp directory of the chroot
 # and executes it.
 	local file_name=$(basename ${1})
-	local subdir=${2#/}
-
-	if [ "${subdir}" != "" ]
-	then
-		copy_to_chroot ${1} ${subdir}/tmp/
-		chroot_path=${clst_chroot_path}${subdir}
-		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
-			${subdir}/tmp/
-		echo "Running ${file_name} in chroot ${chroot_path}"
-		${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1
-	else
-		copy_to_chroot ${1} tmp/
-		chroot_path=${clst_chroot_path}
-		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
-			tmp/
-		echo "Running ${file_name} in chroot ${chroot_path}"
-		${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1
-	fi
-
-	rm -f ${chroot_path}/tmp/${file_name}
-	if [ "${subdir}" != "" ]
-	then
-		delete_from_chroot ${subdir}/tmp/${file_name}
-		delete_from_chroot ${subdir}/tmp/chroot-functions.sh
-	else
-		delete_from_chroot tmp/chroot-functions.sh
-		delete_from_chroot tmp/${file_name}
-	fi
+	local subdir=${2}
+	local destdir=${subdir}/tmp
+	destdir=${destdir#/}
+
+	copy_to_chroot ${1} ${destdir}
+	chroot_path=${clst_chroot_path}${subdir}
+	copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+		${destdir}
+	echo "Running ${file_name} in chroot ${chroot_path}"
+	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+
+	delete_from_chroot ${destdir}/${file_name}
+	delete_from_chroot ${destdir}/chroot-functions.sh
 }
 
 #return codes

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     21830e1ecee05f786e08748bc750a11c6b580e3e
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 00:58:15 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 00:58:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=21830e1e

re-apply "Revert "Use relative path.""

---
 targets/support/functions.sh |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index af57c10..d362ece 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -20,8 +20,7 @@ exec_in_chroot(){
 # and executes it.
 	local file_name=$(basename ${1})
 	local subdir=${2}
-	local destdir=${subdir}/tmp
-	destdir=${destdir#/}
+	local destdir=".${subdir}/tmp"
 
 	copy_to_chroot ${1} ${destdir}
 	chroot_path=${clst_chroot_path}${subdir}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     f4427e7e7f26cd8e521f70031237f9ed043da33d
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 01:17:48 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 01:17:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f4427e7e

Make sure the files we try to execute in the chroot are marked as executable.

---
 targets/support/functions.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index d362ece..37fa74a 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -22,10 +22,15 @@ exec_in_chroot(){
 	local subdir=${2}
 	local destdir=".${subdir}/tmp"
 
+	echo "Copying ${file_name} to ${destdir}"
 	copy_to_chroot ${1} ${destdir}
-	chroot_path=${clst_chroot_path}${subdir}
 	copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
 		${destdir}
+
+	echo "Ensure the file has the executable bit set"
+	chmod +x ${destdir}/${file_name}
+
+	chroot_path=${clst_chroot_path}${subdir}
 	echo "Running ${file_name} in chroot ${chroot_path}"
 	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     0a8d0b5c9fc19ccb56d054e3db53611492e0173f
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  2 01:48:08 2012 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Nov  2 01:48:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0a8d0b5c

We need to specify the chroot_path to the chmod call.

---
 targets/support/functions.sh |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 37fa74a..80e371c 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -27,10 +27,11 @@ exec_in_chroot(){
 	copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
 		${destdir}
 
+	chroot_path=${clst_chroot_path}${subdir}
+
 	echo "Ensure the file has the executable bit set"
-	chmod +x ${destdir}/${file_name}
+	chmod +x ${chroot_path}/${destdir}/${file_name}
 
-	chroot_path=${clst_chroot_path}${subdir}
 	echo "Running ${file_name} in chroot ${chroot_path}"
 	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     a7fb196f07860afdf09f3601bdda9d801d807040
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  8 21:41:07 2013 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan  8 21:41:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a7fb196f

bug fix wrt 443024, recent changes to use lbzip2 were too agressive
and we should only be using lbzip2 OUTSIDE the chroot, inside the
chroot we don't have lbzip2 available at this time.

---
 targets/support/livecdfs-update.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 2712556..77d694e 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -227,7 +227,7 @@ fi
 if [ -n "$(ls /lib/firmware)" ]
 then
 	cd /lib/firmware
-	/bin/tar -I lbzip2 -cpf /lib/firmware.tar.bz2 .
+	/bin/tar -I bzip2 -cpf /lib/firmware.tar.bz2 .
 	rm -rf /lib/firmware/*
 fi
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     f1529e0650df35900ace9054932ff0c0f713aa95
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  5 08:29:19 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Feb  5 08:34:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f1529e06

Add hppa support for netboot 2 target

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=455018
Reviewed-by: Matt Turner <mattst88 <AT> gentoo.org>

---
 targets/support/netboot2-final.sh |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 0a2aa78..2ee207e 100644
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -29,7 +29,19 @@ case ${clst_hostarch} in
 		sleep 0
 		;;
 	hppa)
-		sleep 0
+		# Only one kernel should be there
+		kname=${clst_boot_kernel[0]}
+		rm -f ${clst_target_path}/${kname}-hppa.lif
+
+		palo \
+			-k ${clst_target_path}/kernels/${kname} \
+			-r ${clst_target_path}/kernels/misc/${kname}.igz \
+			-s ${clst_target_path}/${kname}-hppa.lif \
+			-f /dev/null \
+			-b /usr/share/palo/iplboot \
+			-c "0/vmlinux initrd=0/ramdisk root=/dev/ram0" \
+			|| exit 1
+
 		;;
 	sparc*)
 		if [ "${clst_subarch}" == "sparc" ]; then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     9ceebbfdeac3626d52641c195f09297041298341
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Feb  9 20:45:38 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Feb 23 02:02:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9ceebbfd

kmerge.sh: Make /var/tmp/${clst_kname}.config optional

For users that don't want to specify a seed config.

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 targets/support/kmerge.sh |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b731373..ce1dddf 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -109,8 +109,11 @@ genkernel_compile(){
 	else
 		genkernel ${GK_ARGS} || exit 1
 	fi
-	md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
-		/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
+	if [ -e /var/tmp/${clst_kname}.config ]
+	then
+		md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
+			/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
+	fi
 }
 
 build_kernel() {
@@ -177,15 +180,17 @@ then
 fi
 
 CONFIG_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
+if [ -n "${clst_KERNCACHE}" -a
+     -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
 then
-	STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
-	STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
-	if [ "${STR1}" = "${STR2}" ]
+	if [ ! -e /var/tmp/${clst_kname}.config ]
 	then
-		if [ -n "${clst_KERNCACHE}" ]
+		CONFIG_MATCH=1
+	else
+		STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
+		STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
+		if [ "${STR1}" = "${STR2}" ]
 		then
-			#echo "CONFIG match"
 			CONFIG_MATCH=1
 		fi
 	fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     37540ff5e9db28e65a4f55b71c16cec1e7d294ec
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Mar  1 05:57:39 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Mar  1 06:06:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=37540ff5

kmerge.sh: Fix line wrapping typo from 9ceebbf

In 9ceebbf (kmerge.sh: Make /var/tmp/${clst_kname}.config optional,
2013-02-09), I added a KERNCACHE check to a `[` test, wrapping the two
clauses in the test to avoid a very long line.  Unfortunately,
newlines do not appear to be legal in this position.  For example:

  $ if [ -n "a" -a
  > -n "b" ]; then echo "c"; fi
  bash: [: missing `]'
  bash: -n: command not found

This commit fixes the error by explicitly wrapping the line with a
backslash.

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 targets/support/kmerge.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ce1dddf..e78e0b4 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -180,7 +180,7 @@ then
 fi
 
 CONFIG_MATCH=0
-if [ -n "${clst_KERNCACHE}" -a
+if [ -n "${clst_KERNCACHE}" -a \
      -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
 then
 	if [ ! -e /var/tmp/${clst_kname}.config ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     d1c2ba9bdaf1a69078fcbcd6ec4210e829f99f0a
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Wed Mar  6 01:08:07 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Mar  6 01:09:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=d1c2ba9b

create-iso.sh: add usb boot via isohybrid

Add an isohybrid call to create-iso.sh for isolinux targets so the resulting
images are usb/hdd bootable.

---
 targets/support/create-iso.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index af8a793..fe1f0fc 100644
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -264,6 +264,7 @@ case ${clst_hostarch} in
 					echo "Creating ISO using ISOLINUX bootloader"
 					echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}"
 					mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image"
+					isohybrid ${1}
 				elif [ -e ${clst_target_path}/gentoo.efimg ]
 				then
 					echo "Creating ISO using both ISOLINUX and EFI bootloader"
@@ -274,6 +275,7 @@ case ${clst_hostarch} in
 				echo "Creating ISO using ISOLINUX bootloader"
 				echo "mkisofs -J -R -l ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}"
 				mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path} || die "Cannot make ISO image"
+				isohybrid ${1}
 			fi
 		elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ]
 		then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     ed4d1623c3dac22ed008f518b79deecde1f33c26
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sun Mar  3 16:53:18 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar  9 02:47:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ed4d1623

livecdfs-update.sh: Escape ampersands in STARTX sed expression

From sed(1):

  s/regexp/replacement/
    Attempt to match regexp against the pattern space.  If successful,
    replace that portion matched with replacement.  The replacement
    may contain the special character & to refer to that portion of
    the pattern space which matched, and the special escapes \1
    through \9 to refer to the corresponding matching sub-expressions
    in the regexp.

This means that the old expression (with unescaped ampersands) lead
to:

  source /etc/profile ##STARTX##STARTX su - ${first_user} -c startx

when we want:

  source /etc/profile && su - ${first_user} -c startx

with ${first_user} expanded in both cases.

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 targets/support/livecdfs-update.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 77d694e..fda3e36 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -389,7 +389,7 @@ esac
 if [ -e /etc/startx ]
 then
 	sed -i \
-		"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
+		"s:##STARTX:source /etc/profile \&\& su - ${first_user} -c startx:" \
 		/root/.bashrc
 fi
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Jorge Manuel B. S. Vicetto]

commit:     3b83a6ce74e6ae81db0ff31bd7366313d92583c5
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  4 03:13:11 2013 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 17:30:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3b83a6ce

Fix bugs 407051 and 458536 by using FEATURES="preserve-libs" on the unmerge step of livecd-stage2 target.

---
 targets/support/unmerge.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/targets/support/unmerge.sh b/targets/support/unmerge.sh
index 9f11273..907113e 100644
--- a/targets/support/unmerge.sh
+++ b/targets/support/unmerge.sh
@@ -2,6 +2,7 @@
 
 source /tmp/chroot-functions.sh
 
+FEATURES="${clst_myfeatures} preserve-libs"
 run_merge -C ${clst_packages}
 
 exit 0

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     8324fc2ccaa796d6ba06e00d33facc6392d6b811
Author:     Douglas Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Tue May 28 20:20:30 2013 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue May 28 20:20:30 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8324fc2c

Fixes a bug inadvertently caused by 6c0a577 where setting update_seed
to no would result in dropping the use and making of binpkgs while
building stage1, which is undesirable.  The conditional was getting a
bit unwieldly, so I added a comment explaining when it matches, which is
especially helpful to those who don't know every single test flag.

Tested-By: Rick Farina <zerochaos <AT> gentoo.org>
Tested-By: Brian Dolbec <dolsen <AT> gentoo.org>

---
 targets/support/chroot-functions.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 0705b5b..cacf5f8 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -133,7 +133,8 @@ setup_myemergeopts(){
 	then
 		export bootstrap_opts="${bootstrap_opts} -f"
 		export clst_myemergeopts="${clst_myemergeopts} -f"
-	elif [ -n "${clst_PKGCACHE}" -a -z "${clst_update_seed}" ]
+	# if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
+	elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
 	then
 		export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
 		export bootstrap_opts="${bootstrap_opts} -r"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     18f268e8914ec61d76d7ccf575acdd8da100247c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jul 25 05:32:16 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Jul 25 05:32:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=18f268e8

chroot-functions: Give variables more appropriate names.

---
 targets/support/chroot-functions.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index a46268d..75ad7f9 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -144,24 +144,24 @@ setup_myemergeopts(){
 setup_binutils(){
 	if [ -x /usr/bin/binutils-config ]
 	then
-		mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
-		if [ -z "${mythang}" ]
+		my_binutils=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
+		if [ -z "${my_binutils}" ]
 		then
-			mythang=1
+			my_binutils=1
 		fi
-		binutils-config ${mythang}; update_env_settings
+		binutils-config ${my_binutils}; update_env_settings
 	fi
 }
 
 setup_gcc(){
 	if [ -x /usr/bin/gcc-config ]
 	then
-		mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
-		if [ -z "${mythang}" ]
+		my_gcc=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+		if [ -z "${my_gcc}" ]
 		then
-			mythang=1
+			my_gcc=1
 		fi
-		gcc-config ${mythang}; update_env_settings
+		gcc-config ${my_gcc}; update_env_settings
 	fi
 }
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     c0fcbf027169da8b6f0d5e3c80c1526642c6c672
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 07:04:51 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Jul 30 07:08:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c0fcbf02

kmerge.sh: Don't set USE=build for emerging kernels.

USE=build for kernels means that they're not going to be built and that
we just want to install the sources. In catalyst, we do also want to
build the kernels, so settings the (badly named) USE flag prevents
installing sys-devel/bc, ultimately leading to the kernel build failing.

Remove USE=build from kmerge.sh and let it install dependencies
necessary for actually building the kernel. Fixes Live CD builds with
kernels that require bc (>= 3.9, I believe). See bug 478244.

Tested-by: Ben Kohler <bkohler <AT> gmail.com>

---
 targets/support/kmerge.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index e78e0b4..364d226 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -196,9 +196,6 @@ then
 	fi
 fi
 
-[ -e /etc/portage/make.conf ] && \
-	echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf
-
 if [ -n "${clst_KERNCACHE}" ]
 then
 	mkdir -p /tmp/kerncache/${clst_kname}
@@ -237,7 +234,6 @@ then
 fi
 
 build_kernel
-sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/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 };'`

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     8f46d9c21bf3f6a172180b151afcf2443e58517d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 08:06:05 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Jul 30 08:06:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8f46d9c2

Fix a py3 syntax error, use print()

Bug reported by Michael Weber <xmw>

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 75ad7f9..5c30537 100644
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -287,7 +287,7 @@ show_debug() {
 		echo "DEBUG:"
 		echo "Profile/target info:"
 		echo "Profile inheritance:"
-		python -c 'import portage; print portage.settings.profiles'
+		python -c 'import portage; print(portage.settings.profiles)'
 		echo
 		# TODO: make this work on non-portage
 		emerge --info

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     6cd043fb865bf06ac5af8488dfd9b8c219b7aa20
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 04:46:51 2013 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 04:46:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6cd043fb

Revert "kmerge.sh: Don't set USE=build for emerging kernels."

This appears to inadvertantly drop livecd-stage2 use flags entirely.

This reverts commit c0fcbf027169da8b6f0d5e3c80c1526642c6c672.

---
 targets/support/kmerge.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 364d226..e78e0b4 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -196,6 +196,9 @@ then
 	fi
 fi
 
+[ -e /etc/portage/make.conf ] && \
+	echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf
+
 if [ -n "${clst_KERNCACHE}" ]
 then
 	mkdir -p /tmp/kerncache/${clst_kname}
@@ -234,6 +237,7 @@ then
 fi
 
 build_kernel
+sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/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 };'`

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     4736819095355ae1bb6def60952f75505cc28518
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 04:49:11 2013 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 04:49:11 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=47368190

correctly remove USE=build

c0fcbf027169da8b6f0d5e3c80c1526642c6c672 indavertantly dropped all
livecd-stage2 use flags, rewrite to just drop undesired build.

---
 targets/support/kmerge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index e78e0b4..89e7132 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -197,7 +197,7 @@ then
 fi
 
 [ -e /etc/portage/make.conf ] && \
-	echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> /etc/portage/make.conf
+	echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/make.conf
 
 if [ -n "${clst_KERNCACHE}" ]
 then
@@ -237,7 +237,7 @@ then
 fi
 
 build_kernel
-sed -i "/USE=\"\${USE} ${clst_kernel_use} build\"/d" /etc/portage/make.conf
+sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" /etc/portage/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 };'`

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     44e281a18cef719c43637d442e31cd6cb70c595f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 06:13:16 2013 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Aug  2 06:13:16 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=44e281a1

kerncache improperly sets --nodeps

It makes no sense to set --nodeps just because kerncache is being
used, the kernel still must be built at least once

---
 targets/support/kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 89e7132..ef3eb2e 100644
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -202,7 +202,7 @@ fi
 if [ -n "${clst_KERNCACHE}" ]
 then
 	mkdir -p /tmp/kerncache/${clst_kname}
-   	clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1
+	clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
 	KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
 	if [ ! -e /etc/portage/profile/package.provided ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     9f4116ea616f806d02f6abff60a42be222a672c1
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 00:39:06 2013 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 00:39:06 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=9f4116ea

stop tarballing firmware

I can't find a reason why firmware is tarballed in the first
place, and now things are messing up because of missing firmware.
Remove tarballing and tmpfs mount for /lib/firmware and just leave
it alone. Bug 479456

---
 targets/support/livecdfs-update.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 5aaa38e..b34e917 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -220,17 +220,6 @@ then
 	fi
 fi
 
-# Create firmware directory if it does not exist
-[ ! -d /lib/firmware ] && mkdir -p /lib/firmware
-
-# tar up the firmware so that it does not get clobbered by the livecd mounts
-if [ -n "$(ls /lib/firmware)" ]
-then
-	cd /lib/firmware
-	/bin/tar -I bzip2 -cpf /lib/firmware.tar.bz2 .
-	rm -rf /lib/firmware/*
-fi
-
 # Clear out locales
 case ${clst_livecd_type} in
 	gentoo-release-minimal|gentoo-release-universal|gentoo-gamecd)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5c96523ac65eb09f5144d54bcaf374e75e244762
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Wed Mar  6 17:02:59 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 17:23:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5c96523a

livecdfs-update.sh: Use `bash --login` to spawn startx

Starting a "login" version of Bash via `su` is tricky.  The naive:

  su - ${first_user} -c startx

fails because `su - ...` clears a number of environment variables (so
the prefixed `source /etc/profile` doesn't accomplish anything), but
Bash isn't started with the `--login` option, so it doesn't source
/etc/profile internally.  From bash(1):

  A login shell is one whose first character of argument zero is a -,
  or one started with the --login option.
  ...
  An interactive shell is one started without non-option arguments and
  without the -c option whose standard input and error are both
  connected to terminals (as determined by isatty(3)), or one started
  with the -i option...
  ...
  When bash is invoked as an interactive login shell, or as a
  non-interactive shell with the --login option, it first reads and
  executes commands from the file /etc/profile, if that file exists.
  After reading that file, it looks for ~/.bash_profile,
  ~/.bash_login, and ~/.profile, in that order, and reads and executes
  commands from the first one that exists and is readable.  The
  --noprofile option may be used when the shell is started to inhibit
  this behavior.

In order to get the login-style profile loading with a non-interactive
`su` invocation, you need to use something like:

  echo "${command}" | su - "${user}"

This starts a login shell and pipes the command in via stdin, which
seems to fake Bash into thinking its running from an interactive
terminal.  Not the most elegant, but the other implementations I can
think of are even worse:

  su - "${user}" -c "bash --login -c ${command}"
  su - "${user}" -c 'source /etc/profile &&
      (source .bash_profile || ...) && ${command}"

The old expression was broken anyway due to unescaped ampersands in
the sed expression.  From sed(1):

  s/regexp/replacement/
    Attempt to match regexp against the pattern space.  If successful,
    replace that portion matched with replacement.  The replacement
    may contain the special character & to refer to that portion of
    the pattern space which matched, and the special escapes \1
    through \9 to refer to the corresponding matching sub-expressions
    in the regexp.

This means that the old expression (with unescaped ampersands) lead
to:

  source /etc/profile ##STARTX##STARTX su - ${first_user} -c startx

with ${first_user} expanded.  This commented out startx, so it was
never run.

Reviewed-by: Matt Turner <mattst88 <AT> gmail.com>

---
 targets/support/livecdfs-update.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index f8eb425..2b41f9d 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -377,9 +377,7 @@ esac
 # We want the first user to be used when auto-starting X
 if [ -e /etc/startx ]
 then
-	sed -i \
-		"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
-		/root/.bashrc
+	sed -i "s:##STARTX:echo startx | su - '${first_user}':" /root/.bashrc
 fi
 
 if [ -e /lib/rcscripts/addons/udev-start.sh ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     91e899fcfdef836c1c3026dcf128fd7eb026f67c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Oct 11 22:06:14 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 17:23:18 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=91e899fc

Revert "livecdfs-update.sh: Escape ampersands in STARTX sed expression"

This reverts commit ed4d1623c3dac22ed008f518b79deecde1f33c26.

The commit was a v1 commit that was supposed to be replaced.

---
 targets/support/livecdfs-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b34e917..f8eb425 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -378,7 +378,7 @@ esac
 if [ -e /etc/startx ]
 then
 	sed -i \
-		"s:##STARTX:source /etc/profile \&\& su - ${first_user} -c startx:" \
+		"s:##STARTX:source /etc/profile && su - ${first_user} -c startx:" \
 		/root/.bashrc
 fi
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     5467d551c478beb8f6b4d559d3366a9ed2a8fbe1
Author:     Douglas Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Mon Mar  3 04:31:29 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Apr  2 20:04:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5467d551

livecdfs-update: No tmpfs on /lib/firmware

As of a while ago, we no longer ship a separate firmware tarball, so we
don't need a tmpfs for /lib/firmware anymore, so let's stop mounting
one.  Fixes firmware issues with current minimal install ISOs.

---
 targets/support/livecdfs-update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 2b41f9d..b017baf 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -101,7 +101,6 @@ echo "####################################################" >> /etc/fstab
 
 # fstab tweaks
 echo "tmpfs	/					tmpfs	defaults	0 0" >> /etc/fstab
-echo "tmpfs	/lib/firmware			tmpfs	defaults	0 0" >> /etc/fstab
 echo "tmpfs	/usr/portage			tmpfs	defaults	0 0" >> /etc/fstab
 # If /usr/lib/X11/xkb/compiled then make it tmpfs
 if [ -d /usr/lib/X11/xkb/compiled ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     b0377343dd8d6f90850bb200f71e18ad13440308
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 19:32:22 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Sep 11 03:01:54 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=b0377343

chroot-functions.sh: Fix a mis-worded comment

Fixes: 900554b0b067e76d3806e520357d91adbfa4fa0c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> (Mon 19 Dec 2011 11:14:05 PM PST)
subject: Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing the issue.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index ce56157..a31e8bf 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -169,7 +169,7 @@ setup_pkgmgr(){
 	# We need to merge our package manager with USE="build" set in case it is
 	# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, we could
 	# just let emerge @system could merge it.
-	# Use --update or portage won't reinstall the same version.
+	# Use --update or portage might just waste time/cycles and reinstall the same version.
 	[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf
 	run_merge --oneshot --update sys-apps/portage
 	sed -i '/USE="${USE} build"/d' /etc/portage/make.conf

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     5ce1d5852a151ca2da6b592a6826c73acf74b282
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  1 18:12:40 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep  2 05:43:37 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5ce1d585

chroot-functions.sh: Remove --nodeps option from portage update.

This option prevented new deps from being installed with a portage upgrade.

---
 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 5c30537..ce56157 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -171,7 +171,7 @@ setup_pkgmgr(){
 	# just let emerge @system could merge it.
 	# Use --update or portage won't reinstall the same version.
 	[ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf
-	run_merge --oneshot --nodeps --update sys-apps/portage
+	run_merge --oneshot --update sys-apps/portage
 	sed -i '/USE="${USE} build"/d' /etc/portage/make.conf
 }
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     79f9731e7dd3b632b10ac6a993e61417820fe604
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 23:54:36 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Sep 11 03:05:37 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=79f9731e

Fix a relative path bug

This is part 2 of the bugfix.  The first part got committed in:

commit: 2718211aa28019b8142ae8efe2eefdbb67b6aedb
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Sat 11 Jan 2014 08:53:12 PM PST)
Subject: Remove some troublesome trailing slashes from paths

---
 targets/support/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index c8757d4..0894b35 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -34,7 +34,7 @@ exec_in_chroot(){
 
 	echo "Running ${file_name} in chroot:"
 	echo "    ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name}"
-	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+	${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
 
 	delete_from_chroot ${destdir}/${file_name}
 	delete_from_chroot ${destdir}/chroot-functions.sh

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Raúl Porcel]

commit:     0289632ebf197a227314bb5f81888044db209b3d
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 26 12:24:30 2014 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 26 12:24:30 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0289632e

Typo

Signed-off-by: Raúl Porcel <armin76 <AT> gentoo.org>

---
 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index fe1f0fc..bf81cba 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -13,7 +13,7 @@ case ${clst_hostarch} in
 		;;
 	*)
 		cdmaker="mkisofs"
-		cdmakerpkg="app-cdr/cdrkit or app/cdr-cdrtools"
+		cdmakerpkg="app-cdr/cdrkit or app-cdr/cdrtools"
 		;;
 esac
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Raúl Porcel]

commit:     7c54fff486a3b37992381fae81aacec72328c0f3
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 28 11:39:59 2014 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 28 11:39:59 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7c54fff4

Fix name of system.map for sparc

---
 targets/support/netboot2-final.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..53a0670 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -51,7 +51,7 @@ case ${clst_hostarch} in
 		fi
 		for x in ${clst_boot_kernel}; do
 			elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}${x}-a.out
-			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}kernels/misc/System.map-${x} ${clst_target_path}kernels/misc/${x}.igz
+			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}kernels/misc/System-${x}.map ${clst_target_path}kernels/misc/${x}.igz
 		done
 		;;
 	ia64)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Raúl Porcel]

commit:     33491e71001e1071e7dc331bd183ff7b0d394ba1
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 24 14:43:51 2014 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 24 14:43:51 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=33491e71

Fix syntax error

---
 targets/support/create-iso.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 7454adb..d4fd834 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,6 +10,7 @@ case ${clst_hostarch} in
 	alpha)
 		cdmaker="genisoimage"
 		cdmakerpkg="app-cdr/cdrkit"
+		;;
 	mips)
    		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Raúl Porcel]

commit:     784224be0adb91a4e02fd2068649ebe732e129fe
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  3 11:00:43 2014 +0000
Commit:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Wed Dec  3 11:00:43 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=784224be

modify alpha to use genisoimage

alpha needs to use app-cdr/cdrkit's genisoimage with an alpha-specific
option which mkisofs from app-cdr/cdrtools doesn't have

---
 targets/support/create-iso.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index bf81cba..7454adb 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -7,6 +7,9 @@ source ${clst_sharedir}/targets/support/filesystem-functions.sh
 
 # Check for our CD ISO creation tools
 case ${clst_hostarch} in
+	alpha)
+		cdmaker="genisoimage"
+		cdmakerpkg="app-cdr/cdrkit"
 	mips)
    		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
@@ -82,9 +85,8 @@ fi
 case ${clst_hostarch} in
 	alpha)
 		echo ">> Running mkisofs to create iso image...."
-		echo ">> mkisofs -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
-		isomarkboot ${1} /boot/bootlx
+		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
 	;;
 	arm)
 	;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     f11d2f64ff8af00bc4ac13e6d74f46c598334a91
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 20:06:15 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Jan  1 05:58:06 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f11d2f64

Fix a bug that portage didn't get rebuilt with changed use flags

If clst_PGKCACHE is defined, --newuse was not being added to clst_myemergeopts, so then portage was not being rebuilt if portage was already up to date.

Conflicts:
	targets/support/chroot-functions.sh

---
 targets/support/chroot-functions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index ee820ed..3b7f77b 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -170,14 +170,15 @@ setup_pkgmgr(){
 	# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, we could
 	# just let emerge @system could merge it.
 	# Use --update or portage might just waste time/cycles and reinstall the same version.
+	# Use --newuse to make sure it rebuilds with any changed use flags.
 	if [ -n "$1" ];then
 		echo "Adding USE='${USE} $1' to make.conf for portage build"
 		[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf
-		run_merge --oneshot --update sys-apps/portage
+		run_merge --oneshot --update --newuse sys-apps/portage
 		sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
 	else
 		echo "Updating portage with USE='${USE}'"
-		run_merge --oneshot --update sys-apps/portage
+		run_merge --oneshot --update --newuse sys-apps/portage
 	fi
 }
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     131464c86740ee6f6432e63035b02302305a3c2a
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sun Mar  3 12:58:16 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:20 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=131464c8

livecdfs-update.sh: Fix '/etc/sshd' check for sshd_config tweaks

sshd_config lives in /etc/ssh, not /etc/sshd.  This typo has been
present since the block was introduced by c06264e (Initial import of
Catalyst 2.0.0, 2005-04-04), so it's obviously not a widely used
feature ;).  It might be better to just remove the block entirely.

---
 targets/support/livecdfs-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b017baf..60a9a6f 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -5,7 +5,7 @@ RUN_DEFAULT_FUNCS="no"
 source /tmp/chroot-functions.sh
 
 # Allow root logins to our CD by default
-if [ -e /etc/sshd/sshd_config ]
+if [ -e /etc/ssh/sshd_config ]
 then
 	sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
 		/etc/ssh/sshd_config

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     5f837c9d408760a729322b61eba78c3951ffef61
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Mar  8 12:26:16 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=5f837c9d

livecdfs-update.sh: Run env-update to pick up any /etc/env.d/ changes

Otherwise the XSESSION change from e523136 (livecdfs-update.sh: Set
XSESSION in /etc/env.d/90xsession, 2013-03-02) is not noticed.

---
 targets/support/livecdfs-update.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index d16248e..a222ace 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -382,3 +382,5 @@ 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
 fi
+
+env-update

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     733a4e2104be329020f492780720821138f5cb48
Author:     W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Sat Mar  2 19:17:01 2013 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 19:15:21 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=733a4e21

livecdfs-update.sh: Set XSESSION in /etc/env.d/90xsession

As part of the OpenRC migration, the recommended place for configuring
the default X session moved from /etc/rc.conf to /etc/env.d/90xsession
[1].

[1]: http://www.gentoo.org/doc/en/openrc-migration.xml

---
 targets/support/livecdfs-update.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 60a9a6f..d16248e 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -170,8 +170,7 @@ fi
 # Setup configured default X Session
 if [ -n "${clst_livecd_xsession}" ]
 then
-	sed -i "s:#XSESSION=\"Gnome\":XSESSION=\"${clst_livecd_xsession}\":" \
-		/etc/rc.conf
+	echo "XSESSION=\"${clst_livecd_xsession}\"" > /etc/env.d/90xsession
 fi
 
 # touch /etc/asound.state

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     100f238eedc1a34c4fa5a3f15b07482d06f4f391
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:57 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=100f238e

depscan.sh doesn't exists anymore.

 targets/support/post-kmerge.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/post-kmerge.sh b/targets/support/post-kmerge.sh
index c17680c..58b2e08 100755
--- a/targets/support/post-kmerge.sh
+++ b/targets/support/post-kmerge.sh
@@ -7,6 +7,5 @@ source /tmp/chroot-functions.sh
 # Only run depscan.sh if modules exist
 if [ -n "$(ls /lib/modules)" ]
 then
-	/sbin/depscan.sh
 	find /lib/modules -name modules.dep -exec touch {} \;
 fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     d8549032b9081e86465ce3d1f219d5e1043858f1
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:00 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d8549032

Rename System.map in a way that it won't be matched if multiple kernel are used.

The System.map-version file gets renamed to System.map-${kname}.
This causes some trouble when you have more than one kernel as the file from
the previous kernel will be matched as well. To prevent that, I change
the naming slightly.

 targets/support/functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 9419b2b..de37c19 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -107,9 +107,9 @@ extract_kernels() {
 			mv ${1}/initramfs-* ${1}/${x}.igz
 		fi
 
-		if [ -e ${1}/System.map-* ];
+		if [ -e ${1}/System.map-* ]
 		then
-			mv ${1}/System.map-* ${1}/System.map-${x}
+			mv ${1}/System.map-* ${1}/System-${x}.map
 		fi
 	done
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     df44ba2953bc401de6dbc06b4812f644227e89ef
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:58 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=df44ba29

/etc/conf.d/rc doesn't exists anymore.

 targets/support/livecdfs-update.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a222ace..aeae88c 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -11,12 +11,6 @@ then
 		/etc/ssh/sshd_config
 fi
 
-# Turn off udev tarball
-sed -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
-
 # Clean up the time and set to UTC
 rm -rf /etc/localtime
 cp /usr/share/zoneinfo/UTC /etc/localtime

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     0343a18ec34a9d9ef03d917afb5d24cd908752b5
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:59 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0343a18e

Fix merging kernel without kerncache enabled.

This is the proper fix for building kernels without kerncache.
It prevents the creation of kerncache specific files and does not check for them.
Build with kerncache require the later patch to work.

 targets/support/kmerge.sh | 111 +++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 51 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 8e832e1..100c6ef 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -109,7 +109,7 @@ genkernel_compile(){
 	else
 		genkernel ${GK_ARGS} || exit 1
 	fi
-	if [ -e /var/tmp/${clst_kname}.config ]
+	if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${clst_kname}.config ]
 	then
 		md5sum /var/tmp/${clst_kname}.config | awk '{print $1}' > \
 			/tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG
@@ -144,63 +144,58 @@ fi
 # USE variables (and thus different patches enabled/disabled.) Also, there's no
 # real benefit in using the pkgcache for kernel source ebuilds.
 
-USE_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
+
+# Check if we have a match in kerncach
+
+if [ -n "${clst_KERNCACHE}" ]
 then
-	STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
-	STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
-	if [ "${STR1}" = "${STR2}" ]
+
+	USE_MATCH=0
+	if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE ]
 	then
-		#echo "USE Flags match"
-		USE_MATCH=1
-	else
-		if [ -n "${clst_KERNCACHE}" ]
+		STR1=$(for i in `cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
+		STR2=$(for i in ${clst_kernel_use}; do echo $i; done|sort)
+		if [ "${STR1}" = "${STR2}" ]
 		then
-		[ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \
-			rm -r /tmp/kerncache/${clst_kname}/ebuilds
-		[ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \
-			rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config
+			#echo "USE Flags match"
+			USE_MATCH=1
+		else
+			[ -d /tmp/kerncache/${clst_kname}/ebuilds ] && \
+				rm -r /tmp/kerncache/${clst_kname}/ebuilds
+			[ -e /tmp/kerncache/${clst_kname}/usr/src/linux/.config ] && \
+				rm /tmp/kerncache/${clst_kname}/usr/src/linux/.config
 		fi
 	fi
-fi
 
-EXTRAVERSION_MATCH=0
-if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ]
-then
-	STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
-	STR2=${clst_kextraversion}
-	if [ "${STR1}" = "${STR2}" ]
+	EXTRAVERSION_MATCH=0
+	if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION ]
 	then
-		if [ -n "${clst_KERNCACHE}" ]
+		STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.EXTRAVERSION`
+		STR2=${clst_kextraversion}
+		if [ "${STR1}" = "${STR2}" ]
 		then
 			#echo "EXTRAVERSION match"
 			EXTRAVERSION_MATCH=1
 		fi
 	fi
-fi
 
-CONFIG_MATCH=0
-if [ -n "${clst_KERNCACHE}" -a \
-     -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
-then
-	if [ ! -e /var/tmp/${clst_kname}.config ]
+	CONFIG_MATCH=0
+	if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG ]
 	then
-		CONFIG_MATCH=1
-	else
-		STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
-		STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
-		if [ "${STR1}" = "${STR2}" ]
+		if [ ! -e /var/tmp/${clst_kname}.config ]
 		then
 			CONFIG_MATCH=1
+		else
+			STR1=`cat /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.CONFIG`
+			STR2=`md5sum /var/tmp/${clst_kname}.config|awk '{print $1}'`
+			if [ "${STR1}" = "${STR2}" ]
+			then
+				CONFIG_MATCH=1
+			fi
 		fi
 	fi
-fi
 
-[ -e /etc/portage/make.conf ] && \
-	echo "USE=\"\${USE} ${clst_kernel_use} \"" >> /etc/portage/make.conf
-
-if [ -n "${clst_KERNCACHE}" ]
-then
+	# Create the kerncache directory if it doesn't exists
 	mkdir -p /tmp/kerncache/${clst_kname}
 	clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
 	KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
@@ -216,26 +211,39 @@ then
 	fi
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux
 	ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
+
+	# If catalyst has set to a empty string, extraversion wasn't specified so we
+	# skip this part
+	if [ "${EXTRAVERSION_MATCH}" = "0" ]
+	then
+		if [ ! "${clst_kextraversion}" = "" ]
+		then
+			echo "Setting extraversion to ${clst_kextraversion}"
+			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
+		fi
+	fi
+
 else
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux
 	run_merge "${clst_ksource}" || exit 1
-fi
-make_destpath
-
-# If catalyst has set to a empty string, extraversion wasn't specified so we
-# skip this part
-if [ "${EXTRAVERSION_MATCH}" = "0" ]
-then
 	if [ ! "${clst_kextraversion}" = "" ]
 	then
 		echo "Setting extraversion to ${clst_kextraversion}"
 		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
 	fi
 fi
 
+
+# Update USE flag in make.conf
+[ -e ${clst_make_conf} ] && \
+	echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf}
+
+make_destpath
+
+
 build_kernel
 sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" /etc/portage/make.conf
 # grep out the kernel version so that we can do our modules magic
@@ -246,12 +254,13 @@ EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
 unset USE
-echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
 
 
 if [ -n "${clst_KERNCACHE}" ]
 then
-	if [ -e /etc/portage/profile/package.provided ]
+	echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
+
+	if [ -e ${clst_port_conf}/profile/package.provided ]
 	then
 		sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
 	fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     1c7687f60b557d3221661c1a5e25a3dd286cb569
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:56 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1c7687f6

update-modules doesn't exists anymore.

 targets/support/kmerge.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ef3eb2e..8e832e1 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -245,8 +245,6 @@ SUB=`grep ^SUBLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 EXV=`grep ^EXTRAVERSION\ \= /usr/src/linux/Makefile | sed -e "s/EXTRAVERSION =//" -e "s/ //g"`
 clst_fudgeuname=${VER}.${PAT}.${SUB}${EXV}
 
-/sbin/update-modules --assume-kernel=${clst_fudgeuname}
-
 unset USE
 echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     1e853f359d95c1f3a136184c9b125f9d1b7b9581
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 28 11:40:28 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 26 23:36:01 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1e853f35

Fix name of system.map for sparc

 targets/support/netboot2-final.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 3a872a9..94b86e1 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -50,8 +50,8 @@ case ${clst_hostarch} in
 			piggyback=piggyback64
 		fi
 		for x in ${clst_boot_kernel}; do
-			elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}${x}-a.out
-			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}kernels/misc/System-${x}.map ${clst_target_path}kernels/misc/${x}.igz
+			elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}/${x}-a.out
+			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
 	ia64)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     23cd0ed7dc8ab4483bd34810d52309e90de5723a
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 20 13:21:21 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:05 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=23cd0ed7

netboot2.sh: Fix missing slashes in paths

 targets/support/netboot2-final.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 94b86e1..ebd5187 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -4,20 +4,20 @@ source ${clst_shdir}/support/functions.sh
 source ${clst_shdir}/support/filesystem-functions.sh
 
 
-extract_kernels ${clst_target_path}boot
+extract_kernels ${clst_target_path}/boot
 
-# Move kernel binaries to ${clst_target_path}kernels, and
-# move everything else to ${clst_target_path}kernels/misc
-mkdir ${clst_target_path}kernels
-mkdir ${clst_target_path}kernels/misc
+# Move kernel binaries to ${clst_target_path}/kernels, and
+# move everything else to ${clst_target_path}/kernels/misc
+mkdir ${clst_target_path}/kernels
+mkdir ${clst_target_path}/kernels/misc
 
 for x in ${clst_boot_kernel}; do
-	mv ${clst_target_path}boot/${x} ${clst_target_path}kernels
-	mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc
-	mv ${clst_target_path}boot/System.map* ${clst_target_path}kernels/misc/System.map-${x}
+	mv ${clst_target_path}/boot/${x} ${clst_target_path}/kernels
+	mv ${clst_target_path}/boot/${x}.igz ${clst_target_path}/kernels/misc
+	mv ${clst_target_path}/boot/System-${x}.map ${clst_target_path}/kernels/misc
 done
 
-rmdir ${clst_target_path}boot
+rmdir ${clst_target_path}/boot
 
 # Any post-processing necessary for each architecture can be done here.  This
 # may include things like sparc's elftoaout, x86's PXE boot, etc.
@@ -51,7 +51,7 @@ case ${clst_hostarch} in
 		fi
 		for x in ${clst_boot_kernel}; do
 			elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}/${x}-a.out
-			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
+			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System.map-${x} ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
 	ia64)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     15b2b25bb9ace8a5155b493819428d026e621ce7
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:04 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=15b2b25b

Don't make cdtar mandatory.

On hppa, we don't need cdtar.

 targets/support/functions.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index de37c19..f6faa61 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -52,8 +52,12 @@ extract_cdtar() {
 	# which will normally contains a pre-built binary
 	# boot-loader/filesystem skeleton for the ISO.
 	cdtar=${clst_cdtar}
-	[ -z "${cdtar}" ] && die "Required key cdtar not defined, exiting"
-	tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+	if [ -z "${cdtar}" ]
+	then
+		echo "No cdtar specified. Skipping."
+	else
+		tar -I lbzip2 -xpf ${cdtar} -C $1 || die "Couldn't extract cdtar ${cdtar}"
+	fi
 }
 
 extract_kernels() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     61c2dff4545ebf5dac0099e9c598cb2ab2f352b3
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:05 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=61c2dff4

Use the system's iplboot to be sure it matches palo's version.

For hppa, cdtar is a bad idea because the iplboot version in the tar file
might not match palo's version.

 targets/support/bootloader-setup.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index b76b5c4..d9e2620 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -41,6 +41,8 @@ case ${clst_hostarch} in
 	;;
 	hppa)
 		# NO SOFTLEVEL SUPPORT YET
+		mkdir -p $1/boot
+
 		icfg=$1/boot/palo.conf
 		kmsg=$1/boot/kernels.msg
 		hmsg=$1/boot/help.msg
@@ -54,6 +56,9 @@ case ${clst_hostarch} in
 			my_kopts="${my_kopts} ${kopts}"
 		done
 
+		# copy the bootloader for the final image
+		cp /usr/share/palo/iplboot $1/boot/
+
 		echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
 		echo "--bootloader=boot/iplboot" >> ${icfg}
 		echo "--ramdisk=boot/${first}.igz" >> ${icfg}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     fed3b45bb608d2022fbc253aff836397c5801cb7
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:03 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fed3b45b

Fix and improve kernel build when kerncache is enabled.

This patch gets rid of setting ROOT for merging kernel sources. Instead, the
sources are moved manually to the kerncache directory. A new file is created
containing the kernel version and it is fed into package.provided to prevent
merging the kernel sources again.
Brian Dolbec: fix whitespace error.

 targets/support/kmerge.sh | 39 ++++++++++++++++++++++++++++++---------
 1 file changed, 30 insertions(+), 9 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 100c6ef..03869c3 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -197,9 +197,17 @@ then
 
 	# Create the kerncache directory if it doesn't exists
 	mkdir -p /tmp/kerncache/${clst_kname}
-	clst_root_path=/tmp/kerncache/${clst_kname} PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
-	KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
-	if [ ! -e /etc/portage/profile/package.provided ]
+
+	if [ -e /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION ]
+	then
+		KERNELVERSION=$(</tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION)
+		mkdir -p ${clst_port_conf}/profile
+		echo "${KERNELVERSION}" > ${clst_port_conf}/profile/package.provided
+	else
+		rm -f ${clst_port_conf}/profile/package.provided
+	fi
+
+	if [ ! -e ${clst_port_conf}/profile/package.provided ]
 	then
 		mkdir -p /etc/portage/profile
 		echo "${KERNELVERSION}" > /etc/portage/profile/package.provided
@@ -209,8 +217,26 @@ then
 			echo "${KERNELVERSION}" >> /etc/portage/profile/package.provided
 		fi
 	fi
+
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux
-	ln -s /tmp/kerncache/${clst_kname}/usr/src/linux /usr/src/linux
+
+	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1
+
+	SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
+	if [ -L /usr/src/linux ]
+	then
+
+		# A kernel was merged, move it to $SOURCESDIR
+		[ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR}
+
+		KERNELVERSION=`portageq best_visible / "${clst_ksource}"`
+		echo "${KERNELVERSION}" > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.KERNELVERSION
+
+		echo "Moving kernel sources to ${SOURCESDIR} ..."
+		mv `readlink -f /usr/src/linux` ${SOURCESDIR}
+
+	fi
+	ln -sf ${SOURCESDIR} /usr/src/linux
 
 	# If catalyst has set to a empty string, extraversion wasn't specified so we
 	# skip this part
@@ -259,9 +285,4 @@ unset USE
 if [ -n "${clst_KERNCACHE}" ]
 then
 	echo ${clst_kernel_use} > /tmp/kerncache/${clst_kname}/${clst_kname}-${clst_version_stamp}.USE
-
-	if [ -e ${clst_port_conf}/profile/package.provided ]
-	then
-		sed -i "/^$(echo "${KERNELVERSION}" | sed -e 's|/|\\/|g')\$/d" /etc/portage/profile/package.provided
-	fi
 fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     d74ecf9effd6e5b3851ceccf3dadbef908260f2f
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:02 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Feb 27 02:03:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d74ecf9e

Make use of _kernelopts for hppa.

Since hppa only support one command line for both 32 and 64bit kernel,
we merge both kernelopts in the same line.
This is useful for adding extra arguments like 'panic=30' directly in
the spec file.
Brian Dolbec: fix whitepace error.

 targets/support/bootloader-setup.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 857ce6f..b76b5c4 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -47,7 +47,14 @@ case ${clst_hostarch} in
 		# Make sure we strip the extension to the kernel to allow palo to choose
 		boot_kernel_common_name=${first/%32/}
 		boot_kernel_common_name=${boot_kernel_common_name/%64/}
-		echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> ${icfg}
+
+		for x in ${clst_boot_kernel}
+		do
+			eval kopts=\$clst_boot_kernel_${x}_kernelopts
+			my_kopts="${my_kopts} ${kopts}"
+		done
+
+		echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
 		echo "--bootloader=boot/iplboot" >> ${icfg}
 		echo "--ramdisk=boot/${first}.igz" >> ${icfg}
 		for x in ${clst_boot_kernel}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     487f1e94217c6a64b770a3f32d942eb613159be0
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 03:36:04 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 03:36:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=487f1e94

fix USE="$USE $1" showing up in make.conf

 targets/support/chroot-functions.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 95904b3..253eee2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -172,12 +172,12 @@ setup_pkgmgr(){
 	# Use --update or portage might just waste time/cycles and reinstall the same version.
 	# Use --newuse to make sure it rebuilds with any changed use flags.
 	if [ -n "$1" ];then
-		echo "Adding USE='${USE} $1' to make.conf for portage build"
-		[ -e ${clst_make_conf} ] && echo 'USE="${USE} $1"' >> ${clst_make_conf}
+		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
-		sed -i '/USE="${USE} $1"/d' ${clst_make_conf}
+		sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}"
 	else
-		echo "Updating portage with USE='${USE}'"
+		echo "Updating portage with USE=\"${USE}\""
 		run_merge --oneshot --update --newuse sys-apps/portage
 	fi
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 03:45:31 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 03:45:31 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2473eff

USE=${USE} gets parsed in bash instead of in make.conf, \${USE} prevents the expansion until it is already inside make.conf

 targets/support/chroot-functions.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 253eee2..4506eef 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -172,12 +172,12 @@ setup_pkgmgr(){
 	# Use --update or portage might just waste time/cycles and reinstall the same version.
 	# Use --newuse to make sure it rebuilds with any changed use flags.
 	if [ -n "$1" ];then
-		echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
-		[ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> "${clst_make_conf}"
+		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
-		sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}"
+		sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
 	else
-		echo "Updating portage with USE=\"${USE}\""
+		echo "Updating portage with USE=\"\${USE}\""
 		run_merge --oneshot --update --newuse sys-apps/portage
 	fi
 }
@@ -270,7 +270,7 @@ run_merge() {
 	export CONFIG_PROTECT="-*"
 
 	# Set bindist USE flag if clst_BINDIST is set
-	[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf}
+	[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> ${clst_make_conf}
 
 	if [ -n "${clst_VERBOSE}" ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     682265b917afaffcce30026fca6c72f795177dc6
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 04:03:48 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 04:03:48 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=682265b9

remove pointless USE=${USE} message

 targets/support/chroot-functions.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 4506eef..14a2e35 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -177,7 +177,6 @@ setup_pkgmgr(){
 		run_merge --oneshot --update --newuse sys-apps/portage
 		sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}"
 	else
-		echo "Updating portage with USE=\"\${USE}\""
 		run_merge --oneshot --update --newuse sys-apps/portage
 	fi
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     f59ab2fc422dd6c8c2a07c4a89d3fae3f6aa2c69
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 17:55:57 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 17:55:57 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f59ab2fc

safer quoting for clst_make_conf and proper quoting for "USE=${USE} bindist"

prevent possible issues with spaces in $clst_make_conf

prevent ${USE} being expanded by bash and causing the sed removal of
USE="${USE} bindist"
to fail

 targets/support/chroot-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 14a2e35..9066642 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -269,7 +269,7 @@ run_merge() {
 	export CONFIG_PROTECT="-*"
 
 	# Set bindist USE flag if clst_BINDIST is set
-	[ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> ${clst_make_conf}
+	[ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
 
 	if [ -n "${clst_VERBOSE}" ]
 	then
@@ -289,7 +289,7 @@ run_merge() {
 	emerge ${clst_myemergeopts} $@ || exit 1
 
 	# Clean-up USE again
-	sed -i "/USE=\"${USE} bindist\"/d" ${clst_make_conf}
+	sed -i '/USE="${USE} bindist"/d' "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     41cf287b363718c124bd70a8ca8eee715f757206
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 20:07:32 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 20:07:32 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=41cf287b

by request, keep consistant double quotes; fixing sed removal of bindist in chroot-functions.sh

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 9066642..5e046cb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -289,7 +289,7 @@ run_merge() {
 	emerge ${clst_myemergeopts} $@ || exit 1
 
 	# Clean-up USE again
-	sed -i '/USE="${USE} bindist"/d' "${clst_make_conf}"
+	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     9bdb0512140496d53f97f7ef4592921306056d6b
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 21:25:24 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 21:25:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9bdb0512

shuffle where bindist is being set

set USE=bindist in setup_pkgmgr and remove it in cleanup_stage

 targets/support/chroot-functions.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 5e046cb..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -166,6 +166,9 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
+	# Set bindist USE flag if clst_BINDIST is set
+	[ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+
 	# We need to merge our package manager with USE="build" set in case it is
 	# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, we could
 	# just let emerge @system could merge it.
@@ -228,6 +231,9 @@ cleanup_stages() {
 			;;
 	esac
 
+	# Remove bindist from use
+	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+
 	rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
@@ -268,9 +274,6 @@ run_merge() {
 	export EPAUSE_IGNORE=0
 	export CONFIG_PROTECT="-*"
 
-	# Set bindist USE flag if clst_BINDIST is set
-	[ -e "${clst_make_conf}" ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-
 	if [ -n "${clst_VERBOSE}" ]
 	then
 		echo "ROOT=${ROOT} emerge ${clst_myemergeopts} -pt $@" || exit 1
@@ -287,9 +290,6 @@ run_merge() {
 	echo "emerge ${clst_myemergeopts} $@" || exit 1
 
 	emerge ${clst_myemergeopts} $@ || exit 1
-
-	# Clean-up USE again
-	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 }
 
 show_debug() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     44919839b30fff5176e5c261340baf6af173c033
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 01:47:28 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep  3 01:47:28 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44919839

scratch that, tinderbox does not run cleanup

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2986ae7..b8ab8d2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -234,7 +234,7 @@ cleanup_stages() {
 	# Remove bindist from use
 	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
 
-	[ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*
+	rm -f /var/log/emerge.log /var/log/portage/elog/*
 }
 
 update_env_settings(){

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     934849080c2ec3996835c756421f5e22c693c736
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 10 19:39:37 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Sep 10 19:39:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=93484908

workaround bug #560166 by setting USE more properly

 targets/support/chroot-functions.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 91a2b5f..68622f2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -167,8 +167,15 @@ setup_gcc(){
 
 setup_pkgmgr(){
 	# Set bindist USE flag if clst_BINDIST is set
-	[ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \
-		&& [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+	if [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \
+		&& [ -n "${clst_BINDIST}" ]; then
+		if grep -q ^USE "${clst_make_conf}"; then
+			echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
+		else
+			echo "USE=\"bindist\"" >> "${clst_make_conf}"
+		fi
+
+	fi
 
 	# We need to merge our package manager with USE="build" set in case it is
 	# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, we could
@@ -234,6 +241,7 @@ cleanup_stages() {
 
 	# Remove bindist from use
 	sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"
+	sed -i "/USE=\"bindist\"/d" "${clst_make_conf}"
 
 	[ "${clst_target}" != "tinderbox" ] && rm -f /var/log/emerge.log /var/log/portage/elog/*
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     388def77c5bc066c4230c443b84e2477da1ebff2
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 19:44:54 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 19:44:54 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=388def77

kmerge.sh blows away the /usr/src/linux symlink but nothing puts it back in place (nessesarily)
add code to properly setup the symlink to the location the freshly installed kernel sources

 targets/support/kmerge.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b72eeb6..3d4afea 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -253,8 +253,12 @@ then
 	fi
 
 else
-	[ -L /usr/src/linux ] && rm -f /usr/src/linux
 	run_merge "${clst_ksource}" || exit 1
+	#ensure that there is a /usr/src/linux symlink and it points to the sources we just installed
+	echo "Adjusting /usr/src/linux to point to \
+$(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)"
+	ln -snf $(portageq contents / $(portageq best_visible / "${clst_ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \
+		/usr/src/linux
 	if [ ! "${clst_kextraversion}" = "" ]
 	then
 		echo "Setting extraversion to ${clst_kextraversion}"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     c00d023004fcc310112ffc6aa6a049ee24bf38d8
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 17:54:29 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 17:54:29 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c00d0230

fix some quoting in create-iso.sh

 targets/support/create-iso.sh | 120 +++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index a8a194f..9714378 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -100,66 +100,66 @@ run_mkisofs() {
 case ${clst_hostarch} in
 	alpha)
 		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path} || die "Cannot make ISO image"
+		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
 	arm)
 	;;
 	hppa)
 		echo ">> Running mkisofs to create iso image...."
-		run_mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path}/
-		pushd ${clst_target_path}/
-		palo -f boot/palo.conf -C ${1}
+		run_mkisofs -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
+		pushd "${clst_target_path}/"
+		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
 	ia64)
-		if [ ! -e ${clst_target_path}/gentoo.efimg ]
+		if [ ! -e "${clst_target_path}/gentoo.efimg" ]
 		then
-			iaSizeTemp=$(du -sk ${clst_target_path}/boot 2>/dev/null)
+			iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
 			iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 			iaSize=$((${iaSizeB}+32)) # Add slack
 
-			dd if=/dev/zero of=${clst_target_path}/gentoo.efimg bs=1k \
+			dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 				count=${iaSize}
-			mkdosfs -F 16 -n GENTOO ${clst_target_path}/gentoo.efimg
+			mkdosfs -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
 
-			mkdir ${clst_target_path}/gentoo.efimg.mountPoint
-			mount -t vfat -o loop ${clst_target_path}/gentoo.efimg \
-				${clst_target_path}/gentoo.efimg.mountPoint
+			mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
+			mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
+				"${clst_target_path}/gentoo.efimg.mountPoint"
 
 			echo '>> Populating EFI image...'
-			cp -rv ${clst_target_path}/boot/* \
-				${clst_target_path}/gentoo.efimg.mountPoint
+			cp -rv "${clst_target_path}"/boot/* \
+				"${clst_target_path}/gentoo.efimg.mountPoint"
 
-			umount ${clst_target_path}/gentoo.efimg.mountPoint
-			rmdir ${clst_target_path}/gentoo.efimg.mountPoint
+			umount "${clst_target_path}/gentoo.efimg.mountPoint"
+			rmdir "${clst_target_path}/gentoo.efimg.mountPoint"
 		else
 			echo ">> Found populated EFI image at \
 				${clst_target_path}/gentoo.efimg"
 		fi
 		echo '>> Removing /boot...'
-		rm -rf ${clst_target_path}/boot
+		rm -rf "${clst_target_path}/boot"
 
 		echo ">> Running mkisofs to create iso image...."
-		run_mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path}/
+		run_mkisofs -R -l -b gentoo.efimg -c boot.cat -no-emul-boot -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 	;;
 	mips)
 		case ${clst_fstype} in
 			squashfs)
 				# $clst_target_path/[kernels|arcload] already exists, create loopback and sgibootcd
-				[ ! -d "${clst_target_path}/loopback" ] && mkdir ${clst_target_path}/loopback
-				[ ! -d "${clst_target_path}/sgibootcd" ] && mkdir ${clst_target_path}/sgibootcd
+				[ ! -d "${clst_target_path}/loopback" ] && mkdir "${clst_target_path}/loopback"
+				[ ! -d "${clst_target_path}/sgibootcd" ] && mkdir "${clst_target_path}/sgibootcd"
 
 				# Setup variables
-				[ -f "${clst_target_path}/livecd" ] && rm -f ${clst_target_path}/livecd
+				[ -f "${clst_target_path}/livecd" ] && rm -f "${clst_target_path}/livecd"
 				img="${clst_target_path}/loopback/image.squashfs"
 				knl="${clst_target_path}/kernels"
 				arc="${clst_target_path}/arcload"
 				cfg="${clst_target_path}/sgibootcd/sgibootcd.cfg"
-				echo "" > ${cfg}
+				echo "" > "${cfg}"
 
 				# If the image file exists in $clst_target_path, move it to the loopback dir
 				[ -e "${clst_target_path}/image.squashfs" ] \
-					&& mv -f ${clst_target_path}/image.squashfs ${clst_target_path}/loopback
+					&& mv -f "${clst_target_path}/image.squashfs" "${clst_target_path}/loopback"
 
 				# An sgibootcd config is essentially a collection of commandline params
 				# stored in a text file.  We could pass these on the command line, but it's
@@ -200,64 +200,64 @@ case ${clst_hostarch} in
 		esac
 	;;
 	ppc*|powerpc*)
-		if [ -f ${clst_target_path}/ppc/bootinfo.txt ]
+		if [ -f "${clst_target_path}/ppc/bootinfo.txt" ]
 		then
 			echo "bootinfo.txt found .. updating it"
 			sed -i -e \
 			's#^<description>.*</description>$#<description>'"${clst_iso_volume_id}"'</description>#' \
-			${clst_target_path}/ppc/bootinfo.txt
+			"${clst_target_path}/ppc/bootinfo.txt"
 			sed -i -e \
 			's#^<os-name>.*</os-name>$#<os-name>'"${clst_iso_volume_id}"'</os-name>#' \
-			${clst_target_path}/ppc/bootinfo.txt
+			"${clst_target_path}/ppc/bootinfo.txt"
 		fi
 
 		echo ">> Running mkisofs to create iso image...."
-		run_mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map ${clst_target_path}/boot/map.hfs -part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless ${clst_target_path}/boot -hide-hfs "zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path}/
+		run_mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs -part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless "${clst_target_path}"/boot -hide-hfs "zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 	;;
 	sparc*)
 		# Old silo (<=1.2.6) requires a specially built mkisofs
 		# We try to autodetect this in a simple way, said mkisofs
 		# should be in the cdtar, otherwise use the new style.
-		if [ -x ${clst_target_path}/boot/mkisofs.sparc.fu ]
+		if [ -x "${clst_target_path}/boot/mkisofs.sparc.fu" ]
 		then
-			mv ${clst_target_path}/boot/mkisofs.sparc.fu /tmp
+			mv "${clst_target_path}/boot/mkisofs.sparc.fu" /tmp
 			echo "Running mkisofs.sparc.fu to create iso image...."
 			echo "/tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V \"${clst_iso_volume_id}\" ${clst_target_path}/"
-			/tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o ${1} -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V "${clst_iso_volume_id}" ${clst_target_path}/ || die "Cannot make ISO image"
+			/tmp/mkisofs.sparc.fu ${mkisofs_zisofs_opts} -o "${1}" -D -r -pad -quiet -S 'boot/cd.b' -B '/boot/second.b' -s '/boot/silo.conf' -V "${clst_iso_volume_id}" "${clst_target_path}"/ || die "Cannot make ISO image"
 			rm /tmp/mkisofs.sparc.fu
 		else
 			echo "Running mkisofs to create iso image...."
-			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -G "${clst_target_path}/boot/isofs.b" -B ... ${clst_target_path}/
+			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -G "${clst_target_path}/boot/isofs.b" -B ... "${clst_target_path}"/
 		fi
 
 	;;
 	x86|amd64)
-		if [ -e ${clst_target_path}/boot/elilo.efi ]
+		if [ -e "${clst_target_path}/boot/elilo.efi" ]
 		then
-			if [ ! -e ${clst_target_path}/gentoo.efimg ]
+			if [ ! -e "${clst_target_path}/gentoo.efimg" ]
 			then
-				iaSizeTemp=$(du -sk ${clst_target_path}/boot 2>/dev/null)
+				iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 				iaSize=$((${iaSizeB}+32)) # Add slack
 
-				dd if=/dev/zero of=${clst_target_path}/gentoo.efimg bs=1k \
+				dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 					count=${iaSize}
-				mkdosfs -F 16 -n GENTOO ${clst_target_path}/gentoo.efimg
+				mkdosfs -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
 
-				mkdir ${clst_target_path}/gentoo.efimg.mountPoint
-				mount -t vfat -o loop ${clst_target_path}/gentoo.efimg \
-					${clst_target_path}/gentoo.efimg.mountPoint
+				mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
+				mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
+					"${clst_target_path}/gentoo.efimg.mountPoint"
 
 				echo "Populating EFI image"
-				cp -rv ${clst_target_path}/boot/* \
-					${clst_target_path}/gentoo.efimg.mountPoint
+				cp -rv "${clst_target_path}"/boot/* \
+					"${clst_target_path}/gentoo.efimg.mountPoint"
 
-				umount ${clst_target_path}/gentoo.efimg.mountPoint
-				rmdir ${clst_target_path}/gentoo.efimg.mountPoint
-				if [ ! -e ${clst_target_path}/boot/grub/stage2_eltorito ]
+				umount "${clst_target_path}/gentoo.efimg.mountPoint"
+				rmdir "${clst_target_path}/gentoo.efimg.mountPoint"
+				if [ ! -e "${clst_target_path}/boot/grub/stage2_eltorito" ]
 				then
 					echo "Removing /boot"
-					rm -rf ${clst_target_path}/boot
+					rm -rf "${clst_target_path}/boot"
 				fi
 			else
 				echo "Found populated EFI image at \
@@ -265,37 +265,37 @@ case ${clst_hostarch} in
 			fi
 		fi
 
-		if [ -e ${clst_target_path}/isolinux/isolinux.bin ]
+		if [ -e "${clst_target_path}/isolinux/isolinux.bin" ]
 		then
-			if [ -d ${clst_target_path}/boot ]
+			if [ -d "${clst_target_path}/boot" ]
 			then
-				if [ -n "$(ls ${clst_target_path}/boot)" ]
+				if [ -n "$(ls \"${clst_target_path}/boot\")" ]
 				then
-					mv ${clst_target_path}/boot/* ${clst_target_path}/isolinux
-					rm -r ${clst_target_path}/boot
+					mv "${clst_target_path}"/boot/* "${clst_target_path}/isolinux"
+					rm -r "${clst_target_path}/boot"
 					echo "Creating ISO using ISOLINUX bootloader"
-					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}/
-					isohybrid ${1}
-				elif [ -e ${clst_target_path}/gentoo.efimg ]
+					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
+					isohybrid "${1}"
+				elif [ -e "${clst_target_path}/gentoo.efimg" ]
 				then
 					echo "Creating ISO using both ISOLINUX and EFI bootloader"
-					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z ${clst_target_path}/
+					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z "${clst_target_path}"/
 				fi
 			else
 				echo "Creating ISO using ISOLINUX bootloader"
-				run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}/
-				isohybrid ${1}
+				run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
+				isohybrid "${1}"
 			fi
-		elif [ -e ${clst_target_path}/boot/grub/stage2_eltorito ]
+		elif [ -e "${clst_target_path}/boot/grub/stage2_eltorito" ]
 		then
 			echo "Creating ISO using GRUB bootloader"
-			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table ${clst_target_path}/
-		elif [ -e ${clst_target_path}/gentoo.efimg ]
+			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
+		elif [ -e "${clst_target_path}/gentoo.efimg" ]
 		then
 			echo 'Creating ISO using EFI bootloader'
-			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} -b gentoo.efimg -c boot.cat -no-emul-boot ${clst_target_path}/
+			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b gentoo.efimg -c boot.cat -no-emul-boot "${clst_target_path}"/
 		else
-			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o ${1} ${clst_target_path}/
+			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		fi
 	;;
 esac

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     ca8695e0239981fa7f31e0f3eef2fadf8778ddb4
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 18:45:34 2015 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 18:45:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ca8695e0

revert one bad line from the quoting patch.  this still isn't right, but it restores the old and functional behavior as long as there is no space in the path

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 9714378..b4077c3 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -269,7 +269,7 @@ case ${clst_hostarch} in
 		then
 			if [ -d "${clst_target_path}/boot" ]
 			then
-				if [ -n "$(ls \"${clst_target_path}/boot\")" ]
+				if [ -n "$(ls ${clst_target_path}/boot)" ]
 				then
 					mv "${clst_target_path}"/boot/* "${clst_target_path}/isolinux"
 					rm -r "${clst_target_path}/boot"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Mike Frysinger]

commit:     71e548298c6f9a42c8f99f43864a738d3c5f4a00
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 02:46:33 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 04:55:06 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=71e54829

kmerge: do not use --nodeps with kernel install

The kernel might pull in some tools needed to build it (like bc), so don't
merge it with --nodeps.  Seems like its inclusion in fed3b45bb608d2022fbc2
was an oversight.

 targets/support/kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 3d4afea..fc066cc 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -220,7 +220,7 @@ then
 
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux
 
-	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --nodeps --update --newuse" run_merge "${clst_ksource}" || exit 1
+	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse" run_merge "${clst_ksource}" || exit 1
 
 	SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
 	if [ -L /usr/src/linux ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Mike Frysinger]

commit:     bf5670e3d1f8391538c037ae591dfca1a83790dc
Author:     Kevin Zhao <kevin.zhaoshuai <AT> gmail <DOT> com>
AuthorDate: Thu Apr 21 04:42:46 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 05:38:13 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bf5670e3

create-iso: modify the mkisofs parameter of ppc64 little-endian.

ppc64 little-endian has different archtecture and new
boot parameters.  Don't need the hfs and mapping files
as it in Big-endian.  Also tweak the code of Big-endian.

Signed-off-by: Kevin Zhao <kevin.zhaoshuai <AT> gmail.com>
CC: Mike Frysinger <vapier <AT> gentoo.org>
CC: Leno Hou <lenohou <AT> gmail.com>

 targets/support/create-iso.sh | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b4077c3..f45dd7d 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -211,8 +211,22 @@ case ${clst_hostarch} in
 			"${clst_target_path}/ppc/bootinfo.txt"
 		fi
 
+		flags=( -r -U -chrp-boot )
 		echo ">> Running mkisofs to create iso image...."
-		run_mkisofs -r -U -chrp-boot -netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs -part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless "${clst_target_path}"/boot -hide-hfs "zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
+		if [[ ${clst_subarch} == *le ]]
+		then
+			flags+=(
+				-v -T -l -cache-inodes
+			)
+		else
+			flags+=(
+				-netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs
+				-part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless "${clst_target_path}"/boot -hide-hfs
+				"zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts}
+			)
+		fi
+		run_mkisofs "${flags[@]}" \
+			-V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"
 	;;
 	sparc*)
 		# Old silo (<=1.2.6) requires a specially built mkisofs

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Mike Frysinger]

commit:     5076a9ea355663c20016164e10948b7e5cc22ccb
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 17:04:50 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 17:04:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5076a9ea

chroot-functions: genkernel: robustify version parsing

 targets/support/chroot-functions.sh | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 456ae4c..fe39251 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -17,23 +17,25 @@ trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL
 #	* kernel recognizes this and generates SIGINT signal
 trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
 
-check_genkernel_version(){
-	if [ -x /usr/bin/genkernel ]
-	then
-		genkernel_version=$(genkernel --version)
-		genkernel_version_major=${genkernel_version%%.*}
-		genkernel_version_minor_sub=${genkernel_version#${genkernel_version_major}.}
-		genkernel_version_minor=${genkernel_version_minor_sub%%.*}
-		genkernel_version_sub=${genkernel_version##*.}
-		if [ -n "${genkernel_version}" -a "${genkernel_version_major}" -eq '3' -a "${genkernel_version_minor}" -ge '3' ]
-		then
-			echo "Genkernel version ${genkernel_version} found ... continuing"
-		else
-			echo "ERROR: Your genkernel version is too low in your seed stage.  genkernel version 3.3.0"
-			echo "or greater is required."
-			exit 1
-		fi
+check_genkernel_version() {
+	local version parts=() major minor
+
+	version=$(genkernel --version)
+	if [[ -z ${version} ]] ; then
+		echo "ERROR: Could not detect genkernel version!"
+		exit 1
+	fi
+	printf 'Genkernel version '%s' found ... ' "${version}"
+
+	IFS='.' read -a parts <<<"${version}"
+	major=${parts[0]}
+	minor=${parts[1]}
+	if [[ ${major} -gt 3 || ( ${major} -eq 3 && ${minor} -ge 3 ) ]] ; then
+		echo "OK"
 	else
+		echo "FAIL"
+		echo "ERROR: Your genkernel version is too low in your seed stage."
+		echo "       genkernel version 3.3.0 or greater is required."
 		exit 1
 	fi
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     8abeacde9153944ab107d6b7aef69fabead13656
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 03:45:20 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 03:45:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8abeacde

support/create_iso.sh: Aply patch to fix a missing slash

Patch from Rick <zero_kaos> re-adding the removed trailing slash from the variable

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index f45dd7d..15f5ff6 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -87,7 +87,7 @@ fi
 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
-	sed -i "s#${clst_target_path}##" "${clst_target_path}"/isoroot_checksums
+	sed -i "s#${clst_target_path}/\?##" "${clst_target_path}"/isoroot_checksums
 }
 
 run_mkisofs() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     4d9a7982e6441d3eadf03eb9343c80c5247ddda3
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 16 17:34:42 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jul 16 17:34:42 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4d9a7982

create-iso.sh: Update the mkdosfs command to mkfs.vfat

 targets/support/create-iso.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 15f5ff6..0dba674 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -120,7 +120,7 @@ case ${clst_hostarch} in
 
 			dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 				count=${iaSize}
-			mkdosfs -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
+			mkfs.vfat -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
 
 			mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
 			mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
@@ -256,7 +256,7 @@ case ${clst_hostarch} in
 
 				dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 					count=${iaSize}
-				mkdosfs -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
+				mkfs.vfat -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
 
 				mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
 				mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     5b3a6639649e27831b165a59a65f1378369050a0
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 19:45:20 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 19:45:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5b3a6639

if CHOST is being reset that should have already been handled in make.conf so let's just use whatever portage thinks the CHOST is.  seems safe

 targets/support/chroot-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index fe39251..ed8da84 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -146,7 +146,7 @@ setup_myemergeopts(){
 setup_binutils(){
 	if [ -x /usr/bin/binutils-config ]
 	then
-		my_binutils=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
+		my_binutils=$( cd /etc/env.d/binutils; ls ${CHOST}-* | head -n 1 )
 		if [ -z "${my_binutils}" ]
 		then
 			my_binutils=1
@@ -158,7 +158,7 @@ setup_binutils(){
 setup_gcc(){
 	if [ -x /usr/bin/gcc-config ]
 	then
-		my_gcc=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
+		my_gcc=$( cd /etc/env.d/gcc; ls ${CHOST}-* | head -n 1 )
 		if [ -z "${my_gcc}" ]
 		then
 			my_gcc=1

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     28228aff898a97241568b5de9613a51a52712d99
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 03:26:30 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 03:26:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=28228aff

targets/support/chroot-functions.sh: Fix CHROOT partial breakage

Since commit:  d05808a7a8313a66a0be67e89867b4c3a1fe5ca0
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org> (Wed 09 Sep 2015 09:32:27 AM PDT)
Subject: only set CHOST in make.conf if we are setting it via catalyst to override the profile

CHOST has not been consistently set via the arch/*.py files.  As a consequence, there has 
been some silent breakage causing intermittent issues as clst_CHOST was not always
present.  Another recent commit 5b3a6639649e2 also changes clst_CHOST to just CHOST,
but my testing revealed that this too was unset whne it was used in the set_gcc, set_binutils
functions.  The CHOST setting code in set_myfeatures was not run until after the gcc and 
binutils settings have been done.

These changes reverts commit 5b3a6639649e2 CHOST change and restores a
consistently set clst_CHOST.  This seetting will rely on the profile setting unless overriden by 
 spec file or arch.*.py settings for various subarches.

 targets/support/chroot-functions.sh | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index ed8da84..2f79492 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -17,6 +17,18 @@ trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL
 #	* kernel recognizes this and generates SIGINT signal
 trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
 
+# test if CHOST was set on the python side
+if [[ -z "${clst_CHOST}" ]] ; then
+	# No, it wasn't
+	if [[ -z "${clst_chost}" ]] ; then
+		# No override was set, so grab CHOST from the profile
+		export clst_CHOST=$(portageq envvar CHOST)
+	else
+		# Set CHOST from the spec override
+		export clst_CHOST="${clst_chost}"
+	fi
+fi
+
 check_genkernel_version() {
 	local version parts=() major minor
 
@@ -146,7 +158,7 @@ setup_myemergeopts(){
 setup_binutils(){
 	if [ -x /usr/bin/binutils-config ]
 	then
-		my_binutils=$( cd /etc/env.d/binutils; ls ${CHOST}-* | head -n 1 )
+		my_binutils=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
 		if [ -z "${my_binutils}" ]
 		then
 			my_binutils=1
@@ -158,7 +170,7 @@ setup_binutils(){
 setup_gcc(){
 	if [ -x /usr/bin/gcc-config ]
 	then
-		my_gcc=$( cd /etc/env.d/gcc; ls ${CHOST}-* | head -n 1 )
+		my_gcc=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
 		if [ -z "${my_gcc}" ]
 		then
 			my_gcc=1

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Mike Frysinger]

commit:     bdd15f9425bc1aa45d1ed3a8afb57cd751ea0d9c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 21:53:42 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Mar 11 21:54:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bdd15f94

stage1: run bootstrap w/--verbose

 targets/support/chroot-functions.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2f79492..b01bbbb 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -139,6 +139,7 @@ setup_myemergeopts(){
 	if [[ "${clst_VERBOSE}" == "true" ]]
 	then
 		clst_myemergeopts="--verbose"
+		bootstrap_opts="${bootstrap_opts} -v"
 	else
 		clst_myemergeopts="--quiet"
 		bootstrap_opts="${bootstrap_opts} -q"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Robin H. Johnson]

commit:     0f17e92e40d41c54af7bc863f033f1fdc61f9bf3
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Thu Oct 12 16:33:27 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 19:39:22 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0f17e92e

rc-update.sh: fix rc-update calls to work inside chroot

When "rc-update del service" is called without a runlevel specified, it
removes the service from the current runlevel which may or may not be
correct within the chroot.  This commit adds --all to ensure that these
rc-update calls actually take effect.

 targets/support/rc-update.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index c3e8ed9c..f2de50e0 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -11,12 +11,11 @@ fi
 
 if [ "${clst_spec_prefix}" == "livecd" ]
 then
-	# default programs that we always want to start
-	rc-update del iptables
-	rc-update del netmount
-	rc-update del keymaps
-	rc-update del serial
-	rc-update del consolefont
+	rc-update --all del iptables
+	rc-update --all del netmount
+	rc-update --all del keymaps
+	rc-update --all del serial
+	rc-update --all del consolefont
 	# We need to add this one, unconditionally
 	rc-update add autoconfig default
 	[[ -e /etc/init.d/splash ]] && rc-update add splash default

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     d0d5260bc23edc1ef41fa0150767e9a4e848eb78
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Wed Oct 11 17:26:52 2017 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 17:31:58 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d0d5260b

kmerge.sh: ensure bc is installed when kerncache is active

When options=kerncache is on, catalyst finds cached kernel sources and
generates a package.provided entry so these sources aren't reinstalled.
However, this causes all RDEPEND in *-sources to be ignored.  This patch
forces dependencies to be installed beforepackage.provided is generated.

 targets/support/kmerge.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index fc066cc0..f29cd385 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -195,6 +195,10 @@ then
 		fi
 	fi
 
+	# install dependencies of kernel sources ahead of time in case
+	# package.provided generated below causes them not to be (re)installed
+	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1
+
 	# Create the kerncache directory if it doesn't exists
 	mkdir -p /tmp/kerncache/${clst_kname}
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Robin H. Johnson]

commit:     24c933fc9e6a6cd88a6ede43012ab20a3623c1d8
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 23:35:11 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 23:35:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=24c933fc

create-iso: warn & truncate too-long volume label.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 targets/support/create-iso.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 0dba6745..723f8998 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -75,6 +75,14 @@ then
 	esac
 fi
 
+if [ "${#clst_iso_volume_id}" -gt 32 ]; then
+	old_clst_iso_volume_id=${clst_iso_volume_id}
+	clst_iso_volume_id="${clst_iso_volume_id:0:32}"
+	echo "ISO Volume label is too long, truncating to 32 characters" 1>&2
+	echo "old: '${old_clst_iso_volume_id}'" 1>&2
+	echo "new: '${clst_iso_volume_id}'" 1>&2
+fi
+
 if [ "${clst_fstype}" == "zisofs" ]
 then
 	mkisofs_zisofs_opts="-z"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     0b086d215def3d9aa35f080dcd03edbd2b8cda19
Author:     M. J. Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Wed Jan  3 02:00:41 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 16:38:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0b086d21

Added verbose support for genkernel, and callback emerge

 targets/support/kmerge.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index b8593ada..ffa3c9e9 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -69,6 +69,11 @@ setup_gk_args() {
 			GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
 		fi
 	fi
+
+	if [[ "${clst_VERBOSE}" == "true" ]]
+	then
+		GK_ARGS="${GK_ARGS} --loglevel=2"
+	fi
 }
 
 genkernel_compile(){
@@ -92,7 +97,12 @@ genkernel_compile(){
 	esac
 	# Build with genkernel using the set options
 	# callback is put here to avoid escaping issues
-	gk_callback_opts="-qN"
+	if [[ "${clst_VERBOSE}" == "true" ]]
+	then
+		gk_callback_opts="-vN"
+	else
+		gk_callback_opts="-qN"
+	fi
 	PKGDIR=${PKGDIR}
 	if [ -n "${clst_KERNCACHE}" ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     19227738b687938df388d8032d5a090e80f5208c
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 20:21:27 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:21:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=19227738

fix minor whitespace damage

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 7d0c4800..5e760e14 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -269,7 +269,7 @@ case ${clst_hostarch} in
 				mkdir -p "${clst_target_path}"/boot
 			else
 				echo "Preparing EFI boot image"
-				# prepare gentoo.efimg from cdtar's /boot dir 
+				# prepare gentoo.efimg from cdtar's /boot dir
 				iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 				iaSize=$((${iaSizeB}+32)) # Add slack

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     ae7fbbf99102ced2ef6d67426c5240e8e29c8adf
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 17:19:47 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:20:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ae7fbbf9

create-iso.sh: rework UEFI support for amd64/x86

 targets/support/create-iso.sh | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b7c4a7aa..7d0c4800 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -254,54 +254,69 @@ case ${clst_hostarch} in
 
 	;;
 	x86|amd64)
-		if [ -e "${clst_target_path}/boot/elilo.efi" ]
+		# detect if an EFI bootloader is desired
+		if 	[ -d "${clst_target_path}/boot/efi" ] || \
+			[ -d "${clst_target_path}/boot/EFI" ] || \
+			[ -e "${clst_target_path}/gentoo.efimg" ]
 		then
-			if [ ! -e "${clst_target_path}/gentoo.efimg" ]
+			if [ -e "${clst_target_path}/gentoo.efimg" ]
 			then
+				echo "Found prepared EFI boot image at \
+					${clst_target_path}/gentoo.efimg"
+				# /boot must exist and be empty for later logic
+				echo "Removing /boot contents"
+				rm -rf "${clst_target_path}"/boot
+				mkdir -p "${clst_target_path}"/boot
+			else
+				echo "Preparing EFI boot image"
+				# prepare gentoo.efimg from cdtar's /boot dir 
 				iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 				iaSize=$((${iaSizeB}+32)) # Add slack
-
+				echo "Creating loopback file of size ${iaSize}kB"
 				dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 					count=${iaSize}
+				echo "Formatting loopback file with FAT16 FS"
 				mkfs.vfat -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
 
 				mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
+				echo "Mounting FAT16 loopback file"
 				mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
 					"${clst_target_path}/gentoo.efimg.mountPoint"
 
-				echo "Populating EFI image"
+				echo "Populating EFI image file from ${clst_target_path}/boot"
 				cp -rv "${clst_target_path}"/boot/* \
 					"${clst_target_path}/gentoo.efimg.mountPoint"
 
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"
 				rmdir "${clst_target_path}/gentoo.efimg.mountPoint"
-				if [ ! -e "${clst_target_path}/boot/grub/stage2_eltorito" ]
-				then
-					echo "Removing /boot"
-					rm -rf "${clst_target_path}/boot"
-				fi
-			else
-				echo "Found populated EFI image at \
-					${clst_target_path}/gentoo.efimg"
+
+				echo "Removing /boot contents"
+				rm -rf "${clst_target_path}"/boot
+				mkdir -p "${clst_target_path}"/boot
 			fi
 		fi
 
 		if [ -e "${clst_target_path}/isolinux/isolinux.bin" ]
 		then
+			echo "** Found ISOLINUX bootloader"
 			if [ -d "${clst_target_path}/boot" ]
 			then
 				if [ -n "$(ls ${clst_target_path}/boot)" ]
+				# have stray files in /boot, assume ISOLINUX only
 				then
+					echo "** boot dir not empty, moving files to isolinux/ then removing it"
 					mv "${clst_target_path}"/boot/* "${clst_target_path}/isolinux"
 					rm -r "${clst_target_path}/boot"
 					echo "Creating ISO using ISOLINUX bootloader"
 					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
 					isohybrid "${1}"
 				elif [ -e "${clst_target_path}/gentoo.efimg" ]
+				# have BIOS isolinux, plus an EFI loader image
 				then
 					echo "Creating ISO using both ISOLINUX and EFI bootloader"
-					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -b gentoo.efimg -c boot.cat -no-emul-boot -z "${clst_target_path}"/
+					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -eltorito-platform efi -b gentoo.efimg -no-emul-boot -z "${clst_target_path}"/
+					isohybrid --uefi "${1}"
 				fi
 			else
 				echo "Creating ISO using ISOLINUX bootloader"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     2b63b5e7f84303ff9268b1ecce31d9b8a56c5fc3
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 17:26:10 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:27:28 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2b63b5e7

kmerge.sh: allow kernel source upgrades w/ kerncache

Currently when kerncache is on and it detects any usable cache, it
adds a package.provided entry so that no new kernel sources will be
installed.  This patch adds a check for newer kernel sources, so if
newer sources are available then it won't create the package.provided
entry.

 targets/support/kmerge.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index ffa3c9e9..dfdb637c 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -221,15 +221,12 @@ then
 		rm -f ${clst_port_conf}/profile/package.provided
 	fi
 
-	if [ ! -e ${clst_port_conf}/profile/package.provided ]
-	then
-		mkdir -p ${clst_port_conf}/profile
-		echo "${KERNELVERSION}" > ${clst_port_conf}/profile/package.provided
+	# Don't use package.provided if there's a pending up/downgrade
+	if [[ "$(portageq best_visible / ${clst_ksource})" == "${KERNELVERSION}" ]]; then
+		echo "No pending updates for ${clst_ksource}"
 	else
-		if ( ! grep -q "^${KERNELVERSION}\$"  ${clst_port_conf}/profile/package.provided )
-		then
-			echo "${KERNELVERSION}" >> ${clst_port_conf}/profile/package.provided
-		fi
+		echo "Pending updates for ${clst_ksource}, removing package.provided"
+		rm ${clst_port_conf}/profile/package.provided
 	fi
 
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     3a1a48c7d9d5bbaad0466be572661fc08458edb0
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Mon Mar  5 20:36:43 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:36:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3a1a48c7

create-iso.sh: don't add kernel to efi boot image

With GRUB2 bootloader, the kernel can be read from the ISO filesystem,
so having a copy of kernel+initramfs in the EFI boot image is redundant.

 targets/support/create-iso.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 5e760e14..2c40f713 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -269,8 +269,8 @@ case ${clst_hostarch} in
 				mkdir -p "${clst_target_path}"/boot
 			else
 				echo "Preparing EFI boot image"
-				# prepare gentoo.efimg from cdtar's /boot dir
-				iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
+				# prepare gentoo.efimg from cdtar's /boot/EFI dir
+				iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 				iaSize=$((${iaSizeB}+32)) # Add slack
 				echo "Creating loopback file of size ${iaSize}kB"
@@ -284,8 +284,8 @@ case ${clst_hostarch} in
 				mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
 					"${clst_target_path}/gentoo.efimg.mountPoint"
 
-				echo "Populating EFI image file from ${clst_target_path}/boot"
-				cp -rv "${clst_target_path}"/boot/* \
+				echo "Populating EFI image file from ${clst_target_path}/boot/EFI"
+				cp -rv "${clst_target_path}"/boot/EFI/ \
 					"${clst_target_path}/gentoo.efimg.mountPoint"
 
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     28d1d8f38a60a099ba4c4aa5e97e02be74ff12b2
Author:     Ben Kohler <bkohler <AT> gmail <DOT> com>
AuthorDate: Mon Feb 19 17:21:54 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:42:03 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=28d1d8f3

bootloader-setup.sh: add config generator for grub2

 targets/support/bootloader-setup.sh | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index ffe7be2f..8d3e5e7d 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -338,6 +338,38 @@ case ${clst_hostarch} in
 			echo "  localboot -1" >> $icfg
 			echo "  MENU HIDE" >> $icfg
 		fi
+		
+		# GRUB2
+		if [ -d $1/grub ]
+		then
+			if [ -e $1/isolinux/isolinux.bin ]
+			then
+				kern_subdir=/isolinux
+			else
+				cp -f $1/boot/* $1/grub
+				kern_subdir=/grub
+			fi
+			
+			iacfg=$1/grub/grub.cfg
+			echo 'set default=0' > ${iacfg}
+			echo 'set gfxpayload=keep' >> ${iacfg}
+			echo 'set timeout=10' >> ${iacfg}
+			echo 'insmod all_video' >> ${iacfg}
+			echo '' >> ${iacfg}
+			for x in ${clst_boot_kernel}
+			do
+				echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
+				echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
+				echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+				echo "}" >> ${iacfg}
+				echo "" >> ${iacfg}
+				echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
+				echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
+				echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+				echo "}" >> ${iacfg}
+				echo "" >> ${iacfg}
+			done
+		fi
 
 		if [ -e $1/boot/efi/elilo.efi ]
 		then
@@ -362,7 +394,8 @@ case ${clst_hostarch} in
 			done
 			cp ${iacfg} $1/boot/efi/boot
 		fi
-
+		
+		# GRUB legacy (0.97)
 		if [ -e $1/boot/grub/stage2_eltorito ]
 		then
 			icfg=$1/boot/grub/menu.lst

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     aa0c5d61471e9f8ffa403c2005ff84b60ffa6797
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  5 20:45:04 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Mar  5 20:45:04 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=aa0c5d61

fix whitespace damage

 targets/support/bootloader-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 8d3e5e7d..33e26874 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -338,7 +338,7 @@ case ${clst_hostarch} in
 			echo "  localboot -1" >> $icfg
 			echo "  MENU HIDE" >> $icfg
 		fi
-		
+
 		# GRUB2
 		if [ -d $1/grub ]
 		then
@@ -349,7 +349,7 @@ case ${clst_hostarch} in
 				cp -f $1/boot/* $1/grub
 				kern_subdir=/grub
 			fi
-			
+
 			iacfg=$1/grub/grub.cfg
 			echo 'set default=0' > ${iacfg}
 			echo 'set gfxpayload=keep' >> ${iacfg}
@@ -394,7 +394,7 @@ case ${clst_hostarch} in
 			done
 			cp ${iacfg} $1/boot/efi/boot
 		fi
-		
+
 		# GRUB legacy (0.97)
 		if [ -e $1/boot/grub/stage2_eltorito ]
 		then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     2b684f7d8cb5281867cce1f53ebb22e9f687dcce
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 18:54:08 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 18:54:08 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2b684f7d

add more slack and catch error

I have no idea why we are running out of space in the efi boot image,
but for right now I'm just going to detect the failure and blindly add
more slack.

 targets/support/create-iso.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 607a89aa..323179f5 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -124,7 +124,7 @@ case ${clst_hostarch} in
 		then
 			iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
 			iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
-			iaSize=$((${iaSizeB}+32)) # Add slack
+			iaSize=$((${iaSizeB}+64)) # Add slack
 
 			dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 				count=${iaSize}
@@ -136,7 +136,7 @@ case ${clst_hostarch} in
 
 			echo '>> Populating EFI image...'
 			cp -rv "${clst_target_path}"/boot/* \
-				"${clst_target_path}/gentoo.efimg.mountPoint"
+				"${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to populate EFI image"
 
 			umount "${clst_target_path}/gentoo.efimg.mountPoint"
 			rmdir "${clst_target_path}/gentoo.efimg.mountPoint"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     c7c2db9d5487d5a0c4e620c32d703f78951fd16b
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 01:33:44 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 01:33:44 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c7c2db9d

bigger slack, catch issues

 targets/support/create-iso.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 323179f5..2091d918 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -272,7 +272,7 @@ case ${clst_hostarch} in
 				# prepare gentoo.efimg from clst_target_path /boot/EFI dir
 				iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
-				iaSize=$((${iaSizeB}+32)) # Add slack
+				iaSize=$((${iaSizeB}+64)) # add slack, tested near minimum for overhead
 				echo "Creating loopback file of size ${iaSize}kB"
 				dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 					count=${iaSize}
@@ -286,7 +286,7 @@ case ${clst_hostarch} in
 
 				echo "Populating EFI image file from ${clst_target_path}/boot/EFI"
 				cp -rv "${clst_target_path}"/boot/EFI/ \
-					"${clst_target_path}/gentoo.efimg.mountPoint"
+					"${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to populate EFI image file"
 
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"
 				rmdir "${clst_target_path}/gentoo.efimg.mountPoint"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     a81a9de33437f36f0ec1cf52a25e5f26e07f2618
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 20:34:49 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 20:34:49 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a81a9de3

the volume label is used in mokmanager, so make it more obvious

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 2091d918..dcf18d76 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -277,7 +277,7 @@ case ${clst_hostarch} in
 				dd if=/dev/zero of="${clst_target_path}/gentoo.efimg" bs=1k \
 					count=${iaSize}
 				echo "Formatting loopback file with FAT16 FS"
-				mkfs.vfat -F 16 -n GENTOO "${clst_target_path}/gentoo.efimg"
+				mkfs.vfat -F 16 -n GENTOOLIVE "${clst_target_path}/gentoo.efimg"
 
 				mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
 				echo "Mounting FAT16 loopback file"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     f21f16418c91c5b5601aa6c7927f47c57f8d2d66
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  3 20:33:25 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 20:33:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f21f1641

always support both uefi modes

 targets/support/functions.sh | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index e8f3e401..d4834a2d 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -107,23 +107,24 @@ create_bootloader() {
   echo "configfile /grub/grub.cfg" >> grub-stub.cfg
 
   cp /usr/share/grub/unicode.pf2 grub/fonts/
-  if [ "${clst_buildarch}" = "x86" ] || [ "${clst_buildarch}" = "amd64" ]; then
-    # some 64 bit machines have 32 bit UEFI, so we take the safest path
-    mkdir -p grub/i386-efi
-    cp /usr/lib/grub/i386-efi/*.lst /usr/lib/grub/i386-efi/*.img /usr/lib/grub/i386-efi/*.mod grub/i386-efi/
-    ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi"
-    #secure boot shim
-    cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/
-    cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/
-  fi
-  if [ "${clst_buildarch}" = "amd64" ]; then
-    mkdir -p grub/x86_64-efi
-    cp /usr/lib/grub/x86_64-efi/*.lst /usr/lib/grub/x86_64-efi/*.img /usr/lib/grub/x86_64-efi/*.mod grub/x86_64-efi/
-    ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi"
-    #secure boot shim
-    cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/
-    cp /usr/share/shim/mmx64.efi boot/EFI/BOOT/
-  fi
+
+  # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both
+  # set up 32 bit uefi
+  mkdir -p grub/i386-efi
+  cp /usr/lib/grub/i386-efi/*.lst /usr/lib/grub/i386-efi/*.img /usr/lib/grub/i386-efi/*.mod grub/i386-efi/
+  ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi"
+  #secure boot shim
+  cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/
+  cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/
+
+  #set up 64 bit uefi
+  mkdir -p grub/x86_64-efi
+  cp /usr/lib/grub/x86_64-efi/*.lst /usr/lib/grub/x86_64-efi/*.img /usr/lib/grub/x86_64-efi/*.mod grub/x86_64-efi/
+  ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi"
+  #secure boot shim
+  cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/
+  cp /usr/share/shim/mmx64.efi boot/EFI/BOOT/
+
   rm grub-stub.cfg || echo "Failed to remove grub-stub.cfg, but this hurts nothing"
   popd || die "Failed to leave livecd dir"
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     39d0c84674a703154314b5196beefc10f6cec99d
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 18:11:46 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 18:11:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=39d0c846

based on testing by iamben and myself, these files are in the grub standalone image and not required on the livecd

 targets/support/functions.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index d4834a2d..9a7441b6 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -110,16 +110,12 @@ create_bootloader() {
 
   # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both
   # set up 32 bit uefi
-  mkdir -p grub/i386-efi
-  cp /usr/lib/grub/i386-efi/*.lst /usr/lib/grub/i386-efi/*.img /usr/lib/grub/i386-efi/*.mod grub/i386-efi/
   ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi"
   #secure boot shim
   cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/
   cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/
 
   #set up 64 bit uefi
-  mkdir -p grub/x86_64-efi
-  cp /usr/lib/grub/x86_64-efi/*.lst /usr/lib/grub/x86_64-efi/*.img /usr/lib/grub/x86_64-efi/*.mod grub/x86_64-efi/
   ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi"
   #secure boot shim
   cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     198f3cda78d42dd5864c3819d21c920fa9cd6383
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 20:00:25 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 20:00:25 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=198f3cda

thanks to iamben for teaching me how this works, and my own testing, this file is also included in the standalone grub image and not needed

 targets/support/functions.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 9a7441b6..01c7e61c 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -71,7 +71,7 @@ create_bootloader() {
   pushd "${1}" || die "Failed to enter livecd dir ${1}"
 
   # while $1/grub is unused here, it triggers grub config building in bootloader-setup.sh
-  mkdir -p boot/EFI/BOOT grub/fonts isolinux
+  mkdir -p boot/EFI/BOOT isolinux
   #create boot.msg for isolinux
 	echo "Gentoo Linux Installation LiveCD                         http://www.gentoo.org/" > isolinux/boot.msg
 	echo "Enter to boot; F1 for kernels  F2 for options." >> isolinux/boot.msg
@@ -106,8 +106,6 @@ create_bootloader() {
   echo "search --no-floppy --set=root --file /livecd" > grub-stub.cfg
   echo "configfile /grub/grub.cfg" >> grub-stub.cfg
 
-  cp /usr/share/grub/unicode.pf2 grub/fonts/
-
   # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both
   # set up 32 bit uefi
   ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     875230d749cea066b6557d5eefdd3667ad35ef8d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 20:34:33 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 20:34:33 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=875230d7

bootloader-setup.sh: add missing "docache" param for grub menu

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 0197b943..ecb1810b 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -379,7 +379,7 @@ case ${clst_hostarch} in
 				echo "}" >> ${iacfg}
 				echo "" >> ${iacfg}
 				echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
-				echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
+				echo "	linux ${kern_subdir}/${x} ${default_append_line} docache" >> ${iacfg}
 				echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
 				echo "}" >> ${iacfg}
 				echo "" >> ${iacfg}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     e9587331f003752a7e89f6322efc14ee09a182b7
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 16 16:24:02 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Mon Jul 16 16:24:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e9587331

prefer /boot/EFI

users can setup whatever they want in cdtar and it's valid, but because
linux is case sensative we are simply going to prefer /boot/EFI over
/boot/efi

 targets/support/create-iso.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index dcf18d76..3d069ed3 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -269,6 +269,10 @@ case ${clst_hostarch} in
 				mkdir -p "${clst_target_path}"/boot
 			else
 				echo "Preparing EFI boot image"
+        if [ -d "${clst_target_path}/boot/efi" ] && [ ! -d "${clst_target_path}/boot/EFI" ]; then
+          echo "Moving /boot/efi to /boot/EFI"
+          mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI"
+        fi
 				# prepare gentoo.efimg from clst_target_path /boot/EFI dir
 				iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     a4f9396cb3d29eab26b0f2dc2c0f173f1011b76f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 28 00:55:14 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 00:55:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a4f9396c

mkstandalone is too verbose and we aren't developing this anymore, just let it work quieter

 targets/support/functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 01c7e61c..ce43abba 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -108,13 +108,13 @@ create_bootloader() {
 
   # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both
   # set up 32 bit uefi
-  ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= -v || die "Failed to make grubia32.efi"
+  ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O i386-efi -o ./boot/EFI/BOOT/grubia32.efi --themes= || die "Failed to make grubia32.efi"
   #secure boot shim
   cp /usr/share/shim/BOOTIA32.EFI boot/EFI/BOOT/
   cp /usr/share/shim/mmia32.efi boot/EFI/BOOT/
 
   #set up 64 bit uefi
-  ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= -v || die "Failed to make grubx64.efi"
+  ${grubmkstndaln} /boot/grub/grub.cfg=./grub-stub.cfg --compress=xz -O x86_64-efi -o ./boot/EFI/BOOT/grubx64.efi --themes= || die "Failed to make grubx64.efi"
   #secure boot shim
   cp /usr/share/shim/BOOTX64.EFI boot/EFI/BOOT/
   cp /usr/share/shim/mmx64.efi boot/EFI/BOOT/

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     f67924980900067f82afffde433dfc1d03e9e224
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 15:45:35 2018 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 15:45:35 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f6792498

gentoo users know to start services they need, we don't configure any of these services, no real point in starting them

 targets/support/rc-update.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/targets/support/rc-update.sh b/targets/support/rc-update.sh
index f2de50e0..3941f2e0 100755
--- a/targets/support/rc-update.sh
+++ b/targets/support/rc-update.sh
@@ -1,14 +1,5 @@
 #!/bin/bash
 
-if portageq has_version / '>=sys-apps/baselayout-2'
-then
-	# We need to add a few here for baselayout-2
-	[[ -e /etc/init.d/device-mapper ]] && rc-update add device-mapper boot
-	[[ -e /etc/init.d/lvm ]] && rc-update add lvm boot
-	[[ -e /etc/init.d/dmcrypt ]] && rc-update add dmcrypt boot
-	[[ -e /etc/init.d/mdraid ]] && rc-update add mdraid boot
-fi
-
 if [ "${clst_spec_prefix}" == "livecd" ]
 then
 	rc-update --all del iptables

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     94ed72e267b4ee21d78a3b8168114f17e08f3299
Author:     Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 07:52:33 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:39:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=94ed72e2

ppc: Use grub-mkrescue

Grub2 supports PowerPC platforms which is very welcome news since
sys-boot/yaboot is on its last leg.

Tested-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 3d069ed3..0422ae97 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -15,6 +15,10 @@ case ${clst_hostarch} in
    		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
+        ppc*)
+                cdmaker="grub-mkrescue"
+                cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
+                ;;
 	*)
 		cdmaker="mkisofs"
 		cdmakerpkg="app-cdr/cdrkit or app-cdr/cdrtools"
@@ -208,33 +212,8 @@ case ${clst_hostarch} in
 		esac
 	;;
 	ppc*|powerpc*)
-		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
-
-		flags=( -r -U -chrp-boot )
-		echo ">> Running mkisofs to create iso image...."
-		if [[ ${clst_subarch} == *le ]]
-		then
-			flags+=(
-				-v -T -l -cache-inodes
-			)
-		else
-			flags+=(
-				-netatalk -hfs -probe -map "${clst_target_path}"/boot/map.hfs
-				-part -no-desktop -hfs-volid "${clst_iso_volume_id}" -hfs-bless "${clst_target_path}"/boot -hide-hfs
-				"zisofs" -hide-hfs "stages" -hide-hfs "distfiles" -hide-hfs "snapshots" -J ${mkisofs_zisofs_opts}
-			)
-		fi
-		run_mkisofs "${flags[@]}" \
-			-V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"
+		echo ">> Running grub-mkrescue to create iso image...."
+		grub-mkrescue -o "${1}" "${clst_target_path}"
 	;;
 	sparc*)
 		# Old silo (<=1.2.6) requires a specially built mkisofs

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     35a3cfc97b35b5a4005f8f6a835e323321d06734
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 05:34:23 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:34:23 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=35a3cfc9

kmerge.sh: Handle gk_kernargs with spaces

The ppc livecd specs contain

boot/kernel/G5/gk_kernargs: --kernel-cc='gcc -m64' --kernel-ld='ld -m elf64ppc' --kernel-as='as -a64'

And the eval converted that into a sequence of arguments separated by
spaces, ultimately resulting in '--kernel-cc=gcc' '-m64' being passed to
genkernel, breaking the build.

Thanks a ton to James Le Cuirot <chewi <AT> gentoo.org> and Doug Freed
<dwfreed <AT> mtu.edu> for their help in debugging this. The credit goes to
James for coming up with this fix.

 targets/support/kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 029b2a33..429e6a98 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -144,7 +144,7 @@ filtered_kname=${clst_kname/\//_}
 filtered_kname=${filtered_kname/\./_}
 
 eval "clst_kernel_use=\$clst_boot_kernel_${filtered_kname}_use"
-eval "clst_kernel_gk_kernargs=\$clst_boot_kernel_${filtered_kname}_gk_kernargs"
+eval eval clst_kernel_gk_kernargs=( \$clst_boot_kernel_${filtered_kname}_gk_kernargs )
 eval "clst_ksource=\$clst_boot_kernel_${filtered_kname}_sources"
 
 if [ -z "${clst_ksource}" ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     e9c0a0394d1516a03aba93ff673a0ff612c4d3c7
Author:     Luca Barbato <lu_zero <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 18 07:56:55 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:40:18 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e9c0a039

ppc: Generate Grub entries

Tested-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 154 +++++++-----------------------------
 1 file changed, 30 insertions(+), 124 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index ecb1810b..b7e2d313 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -81,139 +81,45 @@ case ${clst_hostarch} in
 		done
 	;;
 	ppc*|powerpc*)
-		# NO SOFTLEVEL SUPPORT YET
-		icfg=$1/boot/yaboot.conf
-		kmsg=$1/boot/boot.msg
-
-		echo "device=cd:" >> ${icfg}
-		echo "root=/dev/ram" >> ${icfg}
-		echo "fgcolor=white" >> ${icfg}
-		echo "bgcolor=black" >> ${icfg}
-		echo "message=/boot/boot.msg" >> ${icfg}
-
-		# Here is where I fix up the boot.msg file.
-		${clst_sed} -e 's/ARCH/PowerPC/' \
-			-e 's/HARDWARE/Apple and IBM hardware/' \
-			-i $kmsg
-
-		# Setup the IBM yaboot.conf
-		etc_icfg=$1/etc/yaboot.conf
-		mkdir -p $1/etc
-		IBM_YABOOT="FALSE"
-		echo "root=/dev/ram" >> ${etc_icfg}
-		echo "fgcolor=white" >> ${etc_icfg}
-		echo "bgcolor=black" >> ${etc_icfg}
-		echo "message=/boot/boot.msg" >> ${etc_icfg}
-
+	    # GRUB2 Openfirmware
+		kern_subdir=/boot
+		iacfg=$1/boot/grub/grub.cfg
+		mkdir -p $1/boot/grub
+		echo 'set default=0' > ${iacfg}
+		echo 'set gfxpayload=keep' >> ${iacfg}
+		echo 'set timeout=10' >> ${iacfg}
+		echo 'insmod all_video' >> ${iacfg}
+		echo '' >> ${iacfg}
 		for x in ${clst_boot_kernel}
 		do
 			eval "clst_kernel_console=\$clst_boot_kernel_${x}_console"
 			eval "clst_kernel_machine_type=\$clst_boot_kernel_${x}_machine_type"
 			eval custom_kopts=\$${x}_kernelopts
 
-			echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
-			if [ "${clst_kernel_machine_type}" == "ibm" ]
+			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
+			echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
+			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+			echo "}" >> ${iacfg}
+			echo "" >> ${iacfg}
+			echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
+			echo "	linux ${kern_subdir}/${x} ${default_append_line} docache" >> ${iacfg}
+			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+			echo "}" >> ${iacfg}
+			if [ -n "${clst_kernel_console}" ]
 			then
-				IBM_YABOOT="true"
-				if [ -n "${clst_kernel_console}" ]
-				then
-					echo >> ${etc_icfg}
-					echo "image=/boot/${x}" >> ${etc_icfg}
-
-					if [ -e "$1/boot/${x}.igz" ]
-					then
-						echo "initrd=/boot/${x}.igz" >> ${etc_icfg}
-					fi
-
-					echo "label=${x}" >> ${etc_icfg}
-					echo "read-write" >> ${icfg}
-					echo "append=\"${default_append_line}\"" >> ${etc_icfg}
-
-					for y in ${clst_kernel_console}
-					do
-						echo ${y}
-						echo >> ${etc_icfg}
-						echo "image=/boot/${x}" >> ${etc_icfg}
-
-						if [ -e "$1/boot/${x}.igz" ]
-						then
-							echo "initrd=/boot/${x}.igz" >> ${etc_icfg}
-						fi
-
-						echo "label=${x}-${y} " >> ${etc_icfg}
-						echo "read-write" >> ${icfg}
-						echo "append=\"${default_append_line} console=${y}\"" >> ${etc_icfg}
-					done
-				else
-					echo >> ${etc_icfg}
-					echo "image=/boot/${x}" >> ${etc_icfg}
-
-					if [ -e "$1/boot/${x}.igz" ]
-					then
-						echo "initrd=/boot/${x}.igz" >> ${etc_icfg}
-					fi
-
-					echo "label=${x}" >> ${etc_icfg}
-					echo "read-write" >> ${etc_icfg}
-					echo "append=\"${default_append_line}\"" >> ${etc_icfg}
-				fi
-			else
-				# Here we wipe out the /ppc directory, if it exists.
-				rm -rf $1/ppc
-				if [ -n "${clst_kernel_console}" ]
-				then
-					echo >> ${icfg}
-					echo "image=/boot/${x}" >> ${icfg}
-
-					if [ -e "$1/boot/${x}.igz" ]
-					then
-						echo "initrd=/boot/${x}.igz" >> ${icfg}
-					fi
-
-					echo "label=${x}" >> ${icfg}
-					echo "read-write" >> ${icfg}
-					echo "append=\"${default_append_line}\"" >> ${icfg}
-
-					for y in ${clst_kernel_console}
-					do
-						echo >> ${icfg}
-						echo "image=/boot/${x}" >> ${icfg}
-
-						if [ -e "$1/boot/${x}.igz" ]
-						then
-							echo "initrd=/boot/${x}.igz" >> ${icfg}
-						fi
-
-						echo "label=${x}-${y} " >> ${icfg}
-						echo "read-write" >> ${icfg}
-						echo "append=\"${default_append_line} console=${y}\"" >> ${icfg}
-					done
-				else
-					echo >> ${icfg}
-					echo "image=/boot/${x}" >> ${icfg}
-
-					if [ -e "$1/boot/${x}.igz" ]
-					then
-						echo "initrd=/boot/${x}.igz" >> ${icfg}
-					fi
-
-					echo "label=${x}" >> ${icfg}
-					echo "read-write" >> ${icfg}
-					echo "append=\"${default_append_line}\"" >> ${icfg}
-				fi
+			echo "submenu 'Special console options (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg}
+				for y in ${clst_kernel_console}
+				do
+					echo "menuentry 'Boot LiveCD (kernel: ${x} console=${y})' --class gnu-linux --class os {"  >> ${iacfg}
+					echo "	linux ${kern_subdir}/${x} ${default_append_line} console=${y}" >> ${iacfg}
+					echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+					echo "}" >> ${iacfg}
+					echo "" >> ${iacfg}
+				done
+				echo "}" >> ${iacfg}
 			fi
+			echo "" >> ${iacfg}
 		done
-
-		if [ "${IBM_YABOOT}" == "FALSE" ]
-		then
-			rm ${etc_kmsg}
-			rmdir $1/etc
-			if [ -d $1/ppc ]
-			then
-				rm -r $1/ppc
-			fi
-		fi
-
 	;;
 	sparc*)
 		# NO SOFTLEVEL SUPPORT YET

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     8c58b6b1221a1b8d990a30dd8e2be18c5725ef76
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 05:33:15 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 05:33:15 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8c58b6b1

kmerge.sh: Convert GK_ARGS to a bash array

Cleaner in my opinion and is also necessary for the next patch.

 targets/support/kmerge.sh | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index dfdb637c..029b2a33 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -9,32 +9,34 @@ PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
 
 setup_gk_args() {
 	# default genkernel args
-	GK_ARGS="${clst_gk_mainargs} \
-			 ${clst_kernel_gk_kernargs} \
-			 --cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp} \
-			 --no-mountboot \
-			 --kerneldir=/usr/src/linux \
-			 --modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2 \
-			 --minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all"
+	GK_ARGS=(
+		"${clst_gk_mainargs}"
+		"${clst_kernel_gk_kernargs[@]}"
+		--cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp}
+		--no-mountboot
+		--kerneldir=/usr/src/linux
+		--modulespackage=/tmp/kerncache/${clst_kname}-modules-${clst_version_stamp}.tar.bz2
+		--minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all
+	)
 	# extra genkernel options that we have to test for
 	if [ -n "${clst_KERNCACHE}" ]
 	then
-		GK_ARGS="${GK_ARGS} --kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2"
+		GK_ARGS+=(--kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2)
 	fi
 	if [ -e /var/tmp/${clst_kname}.config ]
 	then
-		GK_ARGS="${GK_ARGS} --kernel-config=/var/tmp/${clst_kname}.config"
+		GK_ARGS+=(--kernel-config=/var/tmp/${clst_kname}.config)
 	fi
 
 	if [ -n "${clst_splash_theme}" ]
 	then
-		GK_ARGS="${GK_ARGS} --splash=${clst_splash_theme}"
+		GK_ARGS+=(--splash=${clst_splash_theme})
 		# Setup case structure for livecd_type
 		case ${clst_livecd_type} in
 			gentoo-release-minimal|gentoo-release-universal)
 				case ${clst_hostarch} in
 					amd64|x86)
-						GK_ARGS="${GK_ARGS} --splash-res=1024x768"
+						GK_ARGS+=(--splash-res=1024x768)
 					;;
 				esac
 			;;
@@ -43,36 +45,36 @@ setup_gk_args() {
 
 	if [ -d "/tmp/initramfs_overlay/${clst_initramfs_overlay}" ]
 	then
-		GK_ARGS="${GK_ARGS} --initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay}"
+		GK_ARGS+=(--initramfs-overlay=/tmp/initramfs_overlay/${clst_initramfs_overlay})
 	fi
 	if [ -n "${clst_CCACHE}" ]
 	then
-		GK_ARGS="${GK_ARGS} --kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc"
+		GK_ARGS+=(--kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc)
 	fi
 
 	if [ -n "${clst_linuxrc}" ]
 	then
-		GK_ARGS="${GK_ARGS} --linuxrc=/tmp/linuxrc"
+		GK_ARGS+=(--linuxrc=/tmp/linuxrc)
 	fi
 
 	if [ -n "${clst_busybox_config}" ]
 	then
-		GK_ARGS="${GK_ARGS} --busybox-config=/tmp/busy-config"
+		GK_ARGS+=(--busybox-config=/tmp/busy-config)
 	fi
 
 	if [ "${clst_target}" == "netboot2" ]
 	then
-		GK_ARGS="${GK_ARGS} --netboot"
+		GK_ARGS+=(--netboot)
 
 		if [ -n "${clst_merge_path}" ]
 		then
-			GK_ARGS="${GK_ARGS} --initramfs-overlay=\"${clst_merge_path}\""
+			GK_ARGS+=(--initramfs-overlay="${clst_merge_path}")
 		fi
 	fi
 
 	if [[ "${clst_VERBOSE}" == "true" ]]
 	then
-		GK_ARGS="${GK_ARGS} --loglevel=2"
+		GK_ARGS+=(--loglevel=2)
 	fi
 }
 
@@ -82,7 +84,7 @@ genkernel_compile(){
 
 	setup_gk_args
 	#echo "The GK_ARGS are"
-	#echo ${GK_ARGS}
+	#echo ${GK_ARGS[@]}
 	export clst_kernel_merge
 	export clst_initramfs_overlay
 	# Build our list of kernel packages
@@ -115,9 +117,9 @@ genkernel_compile(){
 	if [ "${clst_kernel_merge}" != "" ]
 	then
 		genkernel --callback="emerge ${gk_callback_opts} ${clst_kernel_merge}" \
-			${GK_ARGS} || exit 1
+			"${GK_ARGS[@]}" || exit 1
 	else
-		genkernel ${GK_ARGS} || exit 1
+		genkernel "${GK_ARGS[@]}" || exit 1
 	fi
 	if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${clst_kname}.config ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     53c9407e9aae76b4d2284f7eba3e650895923555
Author:     Michael Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Sun Sep  9 17:17:27 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  1 16:19:50 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=53c9407e

Fix mis-spelling of 'received' in chroot-functions.sh

 targets/support/chroot-functions.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 84d90fe9..ceef21ca 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -3,19 +3,19 @@
 # Set the profile
 eselect profile set ${clst_target_profile}
 
-# Trap these signals and kill ourselves if recieved
-# Force ourselves to die if any of these signals are recieved
+# Trap these signals and kill ourselves if received
+# Force ourselves to die if any of these signals are received
 # most likely our controlling terminal is gone
-trap "echo SIGTERM signal recieved killing $0 with pid $$;kill -9 $$" SIGTERM
-trap "echo SIGHUP signal recieved killing $0 with pid $$;kill -9 $$" SIGHUP
-trap "echo SIGKILL signal recieved killing $0 with pid $$;kill -9 $$" SIGKILL
+trap "echo SIGTERM signal received killing $0 with pid $$;kill -9 $$" SIGTERM
+trap "echo SIGHUP signal received killing $0 with pid $$;kill -9 $$" SIGHUP
+trap "echo SIGKILL signal received killing $0 with pid $$;kill -9 $$" SIGKILL
 
 #SIGINT interrupt character (usually Ctrl-C)
 #	* example: high-level sequence of events
 #	* my process (call it "P") is running
 #	* user types ctrl-c
 #	* kernel recognizes this and generates SIGINT signal
-trap "echo SIGINT signal recieved killing $0 with pid $$;kill -9 $$" SIGINT
+trap "echo SIGINT signal received killing $0 with pid $$;kill -9 $$" SIGINT
 
 # test if CHOST was set on the python side
 if [[ -z "${clst_CHOST}" ]] ; then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Brian Dolbec]

commit:     ab9bdbdf60caab039dab2791162098ae8d0657a7
Author:     Michael Everitt <m.j.everitt <AT> iee <DOT> org>
AuthorDate: Tue Sep 11 03:52:51 2018 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  1 16:26:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ab9bdbdf

Silence warning about binpkgs with non-matching USE flags

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index ceef21ca..506d43f2 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -151,7 +151,7 @@ setup_myemergeopts(){
 	# if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
 	elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
 	then
-		export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
+		export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --binpkg-respect-use=y --newuse"
 		export bootstrap_opts="${bootstrap_opts} -r"
 	fi
 }

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     95818db5546dbecc0818f8ceaabd421e579a785b
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  2 20:17:12 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 20:18:02 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=95818db5

kmerge.sh: make gk_mainargs optional

Since 8c58b6b1221a1b8d990a30dd8e2be18c5725ef76, omitting
target/gk_mainargs in specs supporting it will cause an empty ''
argument to be passed to genkernel.  Genkernel will fail hard on this.

With this fix, we'll only append ${clst_gk_mainargs} to the GK_ARGS
array ${clst_gk_mainargs} is actually set.

 targets/support/kmerge.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 429e6a98..a2ebe093 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -10,7 +10,6 @@ PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
 setup_gk_args() {
 	# default genkernel args
 	GK_ARGS=(
-		"${clst_gk_mainargs}"
 		"${clst_kernel_gk_kernargs[@]}"
 		--cachedir=/tmp/kerncache/${clst_kname}-genkernel_cache-${clst_version_stamp}
 		--no-mountboot
@@ -19,6 +18,10 @@ setup_gk_args() {
 		--minkernpackage=/tmp/kerncache/${clst_kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all
 	)
 	# extra genkernel options that we have to test for
+	if [ -n "${clst_gk_mainargs}" ]
+	then
+		GK_ARGS+=("${clst_gk_mainargs}")
+	fi
 	if [ -n "${clst_KERNCACHE}" ]
 	then
 		GK_ARGS+=(--kerncache=/tmp/kerncache/${clst_kname}-kerncache-${clst_version_stamp}.tar.bz2)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     260dd59d9d770b86ba05f58e30b869f634649ce0
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  2 20:29:52 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Oct  2 20:29:52 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=260dd59d

kmerge.sh: fix quoting on gk_mainargs fix

 targets/support/kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index a2ebe093..c43db8d1 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -20,7 +20,7 @@ setup_gk_args() {
 	# extra genkernel options that we have to test for
 	if [ -n "${clst_gk_mainargs}" ]
 	then
-		GK_ARGS+=("${clst_gk_mainargs}")
+		GK_ARGS+=(${clst_gk_mainargs})
 	fi
 	if [ -n "${clst_KERNCACHE}" ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     2cec1993ea01aab8ba3c7e15e0e563f3a31e29b7
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 19:14:05 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 19:14:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2cec1993

create-iso.sh: use --apparent-size when calculating ESP size

When catalyst uses du to check the size of files to be stored in the
vfat loopback image, FS compression (on the catalyst temp space) may
cause it to report a smaller value than will be needed on vfat.  This
results in "No space left on device" when populating the EFI image.

Adding --apparent-size will tell the true size (rather than on-FS size)
which should be closer to what's needed when stored on vfat.

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 0422ae97..39c3fe07 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -126,7 +126,7 @@ case ${clst_hostarch} in
 	ia64)
 		if [ ! -e "${clst_target_path}/gentoo.efimg" ]
 		then
-			iaSizeTemp=$(du -sk "${clst_target_path}/boot" 2>/dev/null)
+			iaSizeTemp=$(du -sk --apparent-size "${clst_target_path}/boot" 2>/dev/null)
 			iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 			iaSize=$((${iaSizeB}+64)) # Add slack
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     56eff26f4e7473d739ace8c04a5a0af09dd9021c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 17:49:59 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 17:52:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=56eff26f

create-iso.sh: Switch from genisoimage to xorrisofs for Alpha

genisoimage was part of app-cdr/cdrkit which was removed from Gentoo
last year.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>

 targets/support/create-iso.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 39c3fe07..2a53a1da 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -8,8 +8,8 @@ source ${clst_shdir}/support/filesystem-functions.sh
 # Check for our CD ISO creation tools
 case ${clst_hostarch} in
 	alpha)
-		cdmaker="genisoimage"
-		cdmakerpkg="app-cdr/cdrkit"
+		cdmaker="xorrisofs"
+		cdmakerpkg="dev-libs/libisoburn"
 		;;
 	mips)
    		cdmaker="sgibootcd"
@@ -111,8 +111,8 @@ run_mkisofs() {
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
-		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
+		echo ">> xorrisofs -as "genisofs" --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		xorrisofs -as "genisofs" --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
 	arm)
 	;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     b2872413c545c73f1b0edb0cb2ed89439a2f3212
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 17:49:59 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 17:53:05 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2872413

create-iso.sh: Switch from genisoimage to xorrisofs for Alpha

genisoimage was part of app-cdr/cdrkit which was removed from Gentoo
last year.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>

 targets/support/create-iso.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 39c3fe07..2a53a1da 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -8,8 +8,8 @@ source ${clst_shdir}/support/filesystem-functions.sh
 # Check for our CD ISO creation tools
 case ${clst_hostarch} in
 	alpha)
-		cdmaker="genisoimage"
-		cdmakerpkg="app-cdr/cdrkit"
+		cdmaker="xorrisofs"
+		cdmakerpkg="dev-libs/libisoburn"
 		;;
 	mips)
    		cdmaker="sgibootcd"
@@ -111,8 +111,8 @@ run_mkisofs() {
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
-		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
+		echo ">> xorrisofs -as "genisofs" --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		xorrisofs -as "genisofs" --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
 	arm)
 	;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6b3d0333c7c1a0a69b4538e21880e4ec32731a5c
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 16 17:49:59 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Nov 16 18:00:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6b3d0333

create-iso.sh: Switch from genisoimage to xorrisofs for Alpha

genisoimage was part of app-cdr/cdrkit which was removed from Gentoo
last year.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>

 targets/support/create-iso.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 39c3fe07..14c92f4b 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -8,8 +8,8 @@ source ${clst_shdir}/support/filesystem-functions.sh
 # Check for our CD ISO creation tools
 case ${clst_hostarch} in
 	alpha)
-		cdmaker="genisoimage"
-		cdmakerpkg="app-cdr/cdrkit"
+		cdmaker="xorrisofs"
+		cdmakerpkg="dev-libs/libisoburn"
 		;;
 	mips)
    		cdmaker="sgibootcd"
@@ -111,8 +111,8 @@ run_mkisofs() {
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
-		echo ">> genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		genisoimage --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
+		echo ">> xorrisofs -as genisofs --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
+		xorrisofs -as genisofs --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
 	arm)
 	;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     95bb5d90023a3e388a15b7f93b871a3272ebc197
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 21:29:11 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 21:29:47 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=95bb5d90

create-iso.sh: Call xorriso instead of xorrisofs

And correct its argument: -alpha-boot instead of --alpha-boot=.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org>

 targets/support/create-iso.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 14c92f4b..1637c2ea 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -8,7 +8,7 @@ source ${clst_shdir}/support/filesystem-functions.sh
 # Check for our CD ISO creation tools
 case ${clst_hostarch} in
 	alpha)
-		cdmaker="xorrisofs"
+		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
 	mips)
@@ -111,8 +111,8 @@ run_mkisofs() {
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
-		echo ">> xorrisofs -as genisofs --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o ${1} ${clst_target_path}"
-		xorrisofs -as genisofs --alpha-boot=boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
+		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
+		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
 	arm)
 	;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     8a70e1ec82d1dbe29b8edf69514a5073ecc1ed71
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 14:12:40 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 14:12:40 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8a70e1ec

create-iso.sh: copy EFI files onto iso root for vfat/usb compatibility

Tools like rufus & unetbootin will take our iso9660 FS contents &
put them onto a device with real (msdos or gpt) partitions and a vfat
filesystem.  For EFI boot, this means the new FS must contain the EFI
boot images.  The ones we have embedded into the iso (el torito) boot
sector will be lost.

This commit makes sure /EFI is available on the iso image root, so that
it's usable for EFI boot after vfat conversion.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/create-iso.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 1637c2ea..253a8887 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -274,7 +274,10 @@ case ${clst_hostarch} in
 				umount "${clst_target_path}/gentoo.efimg.mountPoint"
 				rmdir "${clst_target_path}/gentoo.efimg.mountPoint"
 
-				echo "Removing /boot contents"
+				echo "Copying /boot/EFI to /EFI for rufus compatability"
+				cp -rv "${clst_target_path}"/boot/EFI/ "${clst_target_path}"
+
+				echo "Emptying /boot"
 				rm -rf "${clst_target_path}"/boot
 				mkdir -p "${clst_target_path}"/boot
 			fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     e8ecf2afe4e580cb6b67902018cf1b297d59e59a
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 21 14:13:43 2018 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 14:13:43 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e8ecf2af

functions.sh: load part_gpt & part_msdos in our grub-stub.cfg

Loading part_gpt & part_msdos in our grub config will allow our image to
boot from partitioned devices (such as those created by rufus or
unetbootin).

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/functions.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index ce43abba..54455210 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -103,7 +103,9 @@ create_bootloader() {
   fi
 
   #create grub-stub.cfg for embedding in grub-mkstandalone
-  echo "search --no-floppy --set=root --file /livecd" > grub-stub.cfg
+  echo "insmod part_gpt" > grub-stub.cfg
+  echo "insmod part_msdos" >> grub-stub.cfg
+  echo "search --no-floppy --set=root --file /livecd" >> grub-stub.cfg
   echo "configfile /grub/grub.cfg" >> grub-stub.cfg
 
   # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Rick Farina]

commit:     ce554ac9b89fe1b724b135bcc57580e9eed1273f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 20:09:21 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 20:09:21 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ce554ac9

fix memtest86 for legacy

the cdtar replacement code appears to be copying the wrong memtest file
per testing from iamben

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 targets/support/functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 54455210..836dc9cc 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -94,9 +94,9 @@ create_bootloader() {
     fi
     #memtest goes under isolinux since it doesn't work for uefi right now
     if [ -f /usr/share/memtest86+/memtest ]; then
-      cp /usr/share/memtest86+/memtest isolinux/memtest86
+      cp /usr/share/memtest86+/memtest.bin isolinux/memtest86
     else
-      echo "Missing /usr/share/memtest86+/memtest, this livecd will not have memtest86+ support.  Enable USE=system-bootloader on catalyst to pull in the correct deps"
+      echo "Missing /usr/share/memtest86+/memtest.bin, this livecd will not have memtest86+ support.  Enable USE=system-bootloader on catalyst to pull in the correct deps"
     fi
   else
     echo "Missing /usr/share/syslinux/isolinux.bin, this livecd will not bios boot.  Enable USE=system-bootloader on catalyst to pull in the correct deps"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Rick Farina]

commit:     b53f0734cdaab1411b94210bbfbb88b5bb4a19a0
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 15 20:08:48 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Tue Jan 15 20:08:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b53f0734

simplify bootloader handling for amd64/x86

remove grub legacy and elilo
keep files in /boot rather than moving them around
simplify create-iso based on the above

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 137 ++++--------------------------------
 targets/support/create-iso.sh       |  65 ++++++-----------
 2 files changed, 33 insertions(+), 169 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index b7e2d313..e4735782 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -183,7 +183,6 @@ case ${clst_hostarch} in
 	x86|amd64)
 		if [ -e $1/isolinux/isolinux.bin ]
 		then
-			cp -f $1/boot/* $1/isolinux
 			# the rest of this function sets up the config file for isolinux
 			icfg=$1/isolinux/isolinux.cfg
 			kmsg=$1/isolinux/kernels.msg
@@ -220,26 +219,26 @@ case ${clst_hostarch} in
 					for y in ${clst_kernel_softlevel}
 					do
 						echo "label ${x}-${y}" >> ${icfg}
-						echo "  kernel ${x}" >> ${icfg}
-						echo "  append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
+						echo "  kernel /boot/${x}" >> ${icfg}
+						echo "  append ${default_append_line} softlevel=${y} initrd=/boot/${x}.igz vga=791" >> ${icfg}
 
 						echo >> ${icfg}
 						echo "   ${x}" >> ${kmsg}
 						echo "label ${x}-${y}-nofb" >> ${icfg}
-						echo "  kernel ${x}" >> ${icfg}
-						echo "  append ${default_append_line} softlevel=${y} initrd=${x}.igz" >> ${icfg}
+						echo "  kernel /boot/${x}" >> ${icfg}
+						echo "  append ${default_append_line} softlevel=${y} initrd=/boot/${x}.igz" >> ${icfg}
 						echo >> ${icfg}
 						echo "   ${x}-nofb" >> ${kmsg}
 					done
 				else
 					echo "label ${x}" >> ${icfg}
-					echo "  kernel ${x}" >> ${icfg}
-					echo "  append ${default_append_line} initrd=${x}.igz vga=791" >> ${icfg}
+					echo "  kernel /boot/${x}" >> ${icfg}
+					echo "  append ${default_append_line} initrd=/boot/${x}.igz vga=791" >> ${icfg}
 					echo >> ${icfg}
 					echo "   ${x}" >> ${kmsg}
 					echo "label ${x}-nofb" >> ${icfg}
-					echo "  kernel ${x}" >> ${icfg}
-					echo "  append ${default_append_line} initrd=${x}.igz" >> ${icfg}
+					echo "  kernel /boot/${x}" >> ${icfg}
+					echo "  append ${default_append_line} initrd=/boot/${x}.igz" >> ${icfg}
 					echo >> ${icfg}
 					echo "   ${x}-nofb" >> ${kmsg}
 				fi
@@ -263,13 +262,6 @@ case ${clst_hostarch} in
 		then
 			#the grub dir may not exist, better safe than sorry
 			[ -d "$1/grub" ] || mkdir -p "$1/grub"
-			if [ -e $1/isolinux/isolinux.bin ]
-			then
-				kern_subdir=/isolinux
-			else
-				cp -f $1/boot/* $1/grub
-				kern_subdir=/grub
-			fi
 
 			iacfg=$1/grub/grub.cfg
 			echo 'set default=0' > ${iacfg}
@@ -280,122 +272,17 @@ case ${clst_hostarch} in
 			for x in ${clst_boot_kernel}
 			do
 				echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
-				echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
-				echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+				echo "	linux /boot/${x} ${default_append_line}" >> ${iacfg}
+				echo "	initrd /boot/${x}.igz" >> ${iacfg}
 				echo "}" >> ${iacfg}
 				echo "" >> ${iacfg}
 				echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
-				echo "	linux ${kern_subdir}/${x} ${default_append_line} docache" >> ${iacfg}
-				echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+				echo "	linux /boot/${x} ${default_append_line} docache" >> ${iacfg}
+				echo "	initrd /boot/${x}.igz" >> ${iacfg}
 				echo "}" >> ${iacfg}
 				echo "" >> ${iacfg}
 			done
 		fi
-
-		if [ -e $1/boot/efi/elilo.efi ]
-		then
-			[ -e $1/isolinux/elilo.efi ] && rm -f $1/isolinux/elilo.efi
-			iacfg=$1/boot/elilo.conf
-			echo 'prompt' > ${iacfg}
-			echo 'message=/efi/boot/elilo.msg' >> ${iacfg}
-			echo 'chooser=simple' >> ${iacfg}
-			echo 'timeout=50' >> ${iacfg}
-			echo >> ${iacfg}
-			for x in ${clst_boot_kernel}
-			do
-				echo "image=/efi/boot/${x}" >> ${iacfg}
-				echo "  label=${x}" >> ${iacfg}
-				echo '  append="'initrd=${x}.igz ${default_append_line}'"' >> ${iacfg}
-				echo "  initrd=/efi/boot/${x}.igz" >> ${iacfg}
-				echo >> ${iacfg}
-				echo "image=/efi/boot/${x}" >> ${iacfg}
-				echo >> ${iacfg}
-				cp -f $1/boot/${x}{,.igz} $1/boot/efi/boot > /dev/null
-				cp -f $1/isolinux/${x}{,.igz} $1/boot/efi/boot > /dev/null
-			done
-			cp ${iacfg} $1/boot/efi/boot
-		fi
-
-		# GRUB legacy (0.97)
-		if [ -e $1/boot/grub/stage2_eltorito ]
-		then
-			icfg=$1/boot/grub/menu.lst
-			echo "default 0" > ${icfg}
-			echo "timeout 15" >> ${icfg}
-			echo "pager on" >> ${icfg}
-
-			# Copy our splash if we're a Gentoo release
-			case ${clst_livecd_type} in
-				gentoo-*)
-					[ -e ${clst_chroot_path}/boot/grub/splash.xpm.gz ] && \
-						cp -f ${clst_chroot_path}/boot/grub/splash.xpm.gz \
-						${1}/boot/grub
-				;;
-			esac
-
-			if [ -e ${1}/boot/grub/splash.xpm.gz ]; then
-				echo "splashimage=/boot/grub/splash.xpm.gz" >> ${icfg}
-			fi
-
-			for x in ${clst_boot_kernel}
-			do
-				eval custom_kopts=\$${x}_kernelopts
-				echo "APPENDING CUSTOM KERNEL ARGS: ${custom_kopts}"
-				echo >> ${icfg}
-
-				eval "clst_kernel_softlevel=\$clst_boot_kernel_${x}_softlevel"
-
-				if [ -n "${clst_kernel_softlevel}" ]
-				then
-					for y in ${clst_kernel_softlevel}
-					do
-						echo "title ${x}-${y}" >> ${icfg}
-						echo "  append ${default_append_line} softlevel=${y} initrd=${x}.igz vga=791" >> ${icfg}
-						if [ -e $1/boot/${x}.igz ]
-						then
-							echo "initrd /boot/${x}.igz" >> ${icfg}
-						fi
-						echo >> ${icfg}
-						echo "title ${x}-${y} [ No FrameBuffer ]" >> ${icfg}
-						echo "kernel /boot/${x} softlevel=${y} ${default_append_line}" >> ${icfg}
-						if [ -e $1/boot/${x}.igz ]
-						then
-							echo "initrd /boot/${x}.igz" >> ${icfg}
-						fi
-						echo >> ${icfg}
-					done
-				else
-					echo "title ${x}" >> ${icfg}
-					echo "kernel /boot/${x} ${default_append_line} vga=791" >> ${icfg}
-					if [ -e $1/boot/${x}.igz ]
-					then
-						echo "initrd /boot/${x}.igz" >> ${icfg}
-					fi
-					echo >> ${icfg}
-					echo "title ${x} [ No FrameBuffer ]" >> ${icfg}
-					echo "kernel /boot/${x} ${default_append_line}" >> ${icfg}
-					if [ -e $1/boot/${x}.igz ]
-					then
-						echo "initrd /boot/${x}.igz" >> ${icfg}
-					fi
-				fi
-
-			done
-
-			# Setup help message
-			echo >> ${icfg}
-			echo "title help" >> ${icfg}
-			cp ${clst_sharedir}/livecd/files/README.txt \
-				$1/boot/help.msg
-			echo "cat /boot/help.msg" >> ${icfg}
-
-			if [ -f $1/boot/memtest86 ]
-			then
-				echo >> ${icfg}
-				echo "title memtest86" >> ${icfg}
-				echo "kernel /boot/memtest86" >> ${icfg}
-			fi
-		fi
 	;;
 	mips)
 		# NO SOFTLEVEL SUPPORT YET

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 253a8887..1b0f05e1 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -242,16 +242,12 @@ case ${clst_hostarch} in
 			then
 				echo "Found prepared EFI boot image at \
 					${clst_target_path}/gentoo.efimg"
-				# /boot must exist and be empty for later logic
-				echo "Removing /boot contents"
-				rm -rf "${clst_target_path}"/boot
-				mkdir -p "${clst_target_path}"/boot
 			else
 				echo "Preparing EFI boot image"
-        if [ -d "${clst_target_path}/boot/efi" ] && [ ! -d "${clst_target_path}/boot/EFI" ]; then
-          echo "Moving /boot/efi to /boot/EFI"
-          mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI"
-        fi
+				if [ -d "${clst_target_path}/boot/efi" ] && [ ! -d "${clst_target_path}/boot/EFI" ]; then
+					echo "Moving /boot/efi to /boot/EFI"
+					mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI"
+				fi
 				# prepare gentoo.efimg from clst_target_path /boot/EFI dir
 				iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
@@ -276,48 +272,29 @@ case ${clst_hostarch} in
 
 				echo "Copying /boot/EFI to /EFI for rufus compatability"
 				cp -rv "${clst_target_path}"/boot/EFI/ "${clst_target_path}"
-
-				echo "Emptying /boot"
-				rm -rf "${clst_target_path}"/boot
-				mkdir -p "${clst_target_path}"/boot
 			fi
 		fi
 
-		if [ -e "${clst_target_path}/isolinux/isolinux.bin" ]
-		then
-			echo "** Found ISOLINUX bootloader"
-			if [ -d "${clst_target_path}/boot" ]
-			then
-				if [ -n "$(ls ${clst_target_path}/boot)" ]
-				# have stray files in /boot, assume ISOLINUX only
-				then
-					echo "** boot dir not empty, moving files to isolinux/ then removing it"
-					mv "${clst_target_path}"/boot/* "${clst_target_path}/isolinux"
-					rm -r "${clst_target_path}/boot"
-					echo "Creating ISO using ISOLINUX bootloader"
-					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
-					isohybrid "${1}"
-				elif [ -e "${clst_target_path}/gentoo.efimg" ]
-				# have BIOS isolinux, plus an EFI loader image
-				then
-					echo "Creating ISO using both ISOLINUX and EFI bootloader"
-					run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -eltorito-platform efi -b gentoo.efimg -no-emul-boot -z "${clst_target_path}"/
-					isohybrid --uefi "${1}"
-				fi
-			else
-				echo "Creating ISO using ISOLINUX bootloader"
-				run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
-				isohybrid "${1}"
-			fi
-		elif [ -e "${clst_target_path}/boot/grub/stage2_eltorito" ]
-		then
-			echo "Creating ISO using GRUB bootloader"
-			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b boot/grub/stage2_eltorito -c boot/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
-		elif [ -e "${clst_target_path}/gentoo.efimg" ]
-		then
+		if [ -e "${clst_target_path}/isolinux/isolinux.bin" ]; then
+			echo '** Found ISOLINUX bootloader'
+			if [ -e "${clst_target_path}/gentoo.efimg" ]; then
+			  # have BIOS isolinux, plus an EFI loader image
+			  echo '** Found GRUB2 EFI bootloader'
+				echo 'Creating ISO using both ISOLINUX and EFI bootloader'
+				run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot -eltorito-platform efi -b gentoo.efimg -no-emul-boot -z "${clst_target_path}"/
+				isohybrid --uefi "${1}"
+		  else
+			  echo 'Creating ISO using ISOLINUX bootloader'
+			  run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table "${clst_target_path}"/
+			  isohybrid "${1}"
+		  fi
+		elif [ -e "${clst_target_path}/gentoo.efimg" ]; then
+			echo '** Found GRUB2 EFI bootloader'
 			echo 'Creating ISO using EFI bootloader'
 			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" -b gentoo.efimg -c boot.cat -no-emul-boot "${clst_target_path}"/
 		else
+			echo '** Found no known bootloader'
+			echo 'Creating ISO with fingers crossed that you know what you are doing...'
 			run_mkisofs -J -R -l ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		fi
 	;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Rick Farina]

commit:     13611461754cb0e974d5a2f0d926c970cc2bdb1f
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 16:20:22 2019 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 16:20:22 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=13611461

loopback is required, be sure to fail if it does

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 1b0f05e1..8338e301 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -261,7 +261,7 @@ case ${clst_hostarch} in
 				mkdir "${clst_target_path}/gentoo.efimg.mountPoint"
 				echo "Mounting FAT16 loopback file"
 				mount -t vfat -o loop "${clst_target_path}/gentoo.efimg" \
-					"${clst_target_path}/gentoo.efimg.mountPoint"
+					"${clst_target_path}/gentoo.efimg.mountPoint" || die "Failed to mount EFI image file"
 
 				echo "Populating EFI image file from ${clst_target_path}/boot/EFI"
 				cp -rv "${clst_target_path}"/boot/EFI/ \

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     2d06d6ed29dd897e1032930c506eacff3215c774
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 21:05:06 2019 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 21:05:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d06d6ed

functions.sh: find more kernel names (genkernel-4 support)

Also cleaned up some comments & re-enabled the installation of config-*
to /boot

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/functions.sh | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 836dc9cc..88e9ad3b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -149,33 +149,34 @@ extract_kernels() {
 		mkdir -p ${1}/
 		tar -I lbzip2 -xf ${kbinary} -C ${1}/
 
-		# change config name from "config-*" to "gentoo", for example
-		#mv ${1}/config-* ${1}/${x}-config
-		rm ${1}/config-*
+		# change config name from "config-*" to "gentoo-config", for example
+		mv ${1}/config-* ${1}/${x}-config
 
 		# change kernel name from "kernel" to "gentoo", for example
 		if [ -e ${1}/kernel-* ]
 		then
 			mv ${1}/kernel-* ${1}/${x}
 		fi
-
-		# change kernel name from "kernelz" to "gentoo", for example
 		if [ -e ${1}/kernelz-* ]
 		then
 			mv ${1}/kernelz-* ${1}/${x}
 		fi
+		if [ -e ${1}/vmlinuz-* ]
+		then
+			mv ${1}/vmlinuz-* ${1}/${x}
+		fi
 
 		# change initrd name from "initrd" to "gentoo.igz", for example
 		if [ -e ${1}/initrd-* ]
 		then
 			mv ${1}/initrd-* ${1}/${x}.igz
 		fi
-
 		if [ -e ${1}/initramfs-* ]
 		then
 			mv ${1}/initramfs-* ${1}/${x}.igz
 		fi
 
+		# rename "System.map" to "System-gentoo.map", for example
 		if [ -e ${1}/System.map-* ]
 		then
 			mv ${1}/System.map-* ${1}/System-${x}.map
@@ -209,15 +210,20 @@ extract_kernel() {
 	rm ${1}/config-*
 
 	# change kernel name from "kernel" to "gentoo", for example
-	mv ${1}/kernel-* ${1}/${2}
+	if [ -e ${1}/kernel-* ]
+	then
+		mv ${1}/kernel-* ${1}/${2}
+	fi
+	if [ -e ${1}/vmlinuz-* ]
+	then
+		mv ${1}/vmlinuz-* ${1}/${2}
+	fi
 
 	# change initrd name from "initrd" to "gentoo.igz", for example
 	if [ -e ${1}/initrd-* ]
 	then
 		mv ${1}/initrd-* ${1}/${2}.igz
 	fi
-
-	# change initramfs name from "initramfs" to "gentoo.igz", for example
 	if [ -e ${1}/initramfs-* ]
 	then
 		mv ${1}/initramfs-* ${1}/${2}.igz

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     44ed4c96cf48aa4268eb4eb5c71f382275303419
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 02:25:03 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 02:26:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44ed4c96

kmerge.sh: Ignore missing package.provided

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c43db8d1..754a129f 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -231,7 +231,7 @@ then
 		echo "No pending updates for ${clst_ksource}"
 	else
 		echo "Pending updates for ${clst_ksource}, removing package.provided"
-		rm ${clst_port_conf}/profile/package.provided
+		rm -f ${clst_port_conf}/profile/package.provided
 	fi
 
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     92706a41fadbccf0a39af08ea2a52a2696c68603
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:30:10 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 07:39:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=92706a41

targets: Fix setting FEATURES="clean-logs"

This likely fixes a bug in 8ca52570aa2d ("keep logs outside of chroot")
that would have prevented any logs (except for those from
dev-util/ccache, sys-devel/distcc, and sys-devel/icecream) from being
kept, since "clean-logs" was added to FEATURES in the wrong place.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 05f311cf..8996119c 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,7 +78,8 @@ get_libdir() {
 
 setup_myfeatures(){
 	setup_myemergeopts
-	export FEATURES="-news clean-logs"
+	export clst_myfeatures="-news clean-logs"
+	export FEATURES="${clst_myfeatures}"
 	if [ -n "${clst_CCACHE}" ]
 	then
 		export clst_myfeatures="${clst_myfeatures} ccache"
@@ -132,7 +133,7 @@ setup_myfeatures(){
 		export PATH="/usr/lib/icecc/bin:${PATH}"
 		export PREROOTPATH="/usr/lib/icecc/bin"
 	fi
-	export FEATURES="${clst_myfeatures} -news"
+	export FEATURES="${clst_myfeatures}"
 }
 
 setup_myemergeopts(){

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     febc83bc30a210bc14a34b671d3340a2aff8e59e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 29 00:55:42 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:48:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=febc83bc

targets: Remove some dead code

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 82164f64..b09a7531 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -182,17 +182,6 @@ setup_gcc(){
 }
 
 setup_pkgmgr(){
-	# Set bindist USE flag if clst_BINDIST is set
-	# this is handled independantly in stage2, changes here should be mirrored there
-	#if [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \
-	#	&& [ -n "${clst_BINDIST}" ]; then
-	#	if grep -q ^USE "${clst_make_conf}"; then
-	#		echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}"
-	#	else
-	#		echo "USE=\"bindist\"" >> "${clst_make_conf}"
-	#	fi
-	#fi
-
 	# We need to merge our package manager with USE="build" set in case it is
 	# portage to avoid frying our /etc/portage/make.conf file.  Otherwise, we could
 	# just let emerge @system could merge it.
@@ -256,7 +245,6 @@ cleanup_stages() {
 	esac
 
 	# 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}"
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     b08a8fabf0c8e6c279848286f74a0c223c82947b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 23:33:31 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:48:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b08a8fab

targets: Build with FEATURES=binpkg-multi-instance

Allows stage3+ builds (e.g., netboot, ISOs, stage4) to share binpkg
directories easily.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b09a7531..94f7c92f 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,7 +78,7 @@ get_libdir() {
 
 setup_myfeatures(){
 	setup_myemergeopts
-	export clst_myfeatures="-news clean-logs"
+	export clst_myfeatures="-news binpkg-multi-instance clean-logs"
 	export FEATURES="${clst_myfeatures}"
 	if [ -n "${clst_CCACHE}" ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     080d8f7ffdcc0f2ec625c419bdd21354db97008d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 00:29:34 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 29 17:48:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=080d8f7f

targets: Build with FEATURES=parallel-install

Greatly speeds up package installation on multi-core systems, especially
when installing mostly binary packages.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 94f7c92f..2207e7b4 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -78,7 +78,7 @@ get_libdir() {
 
 setup_myfeatures(){
 	setup_myemergeopts
-	export clst_myfeatures="-news binpkg-multi-instance clean-logs"
+	export clst_myfeatures="-news binpkg-multi-instance clean-logs parallel-install"
 	export FEATURES="${clst_myfeatures}"
 	if [ -n "${clst_CCACHE}" ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5dd31a12da4f85070d1882a488a73368729d4244
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 30 23:35:23 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 30 23:47:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5dd31a12

targets: Remove 'system' target remnants

Has been broken for 10 years at least, and system.py was merged out of
existence in commit 415b30bf2d34 (Replace content on master with content
from catalyst_2)

Closes: https://bugs.gentoo.org/301153
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2207e7b4..147ca329 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -227,7 +227,7 @@ cleanup_stages() {
 		cleanup_icecream
 	fi
 	case ${clst_target} in
-		stage3|system)
+		stage3)
 			run_merge --depclean --with-bdeps=y
 			;;
 		*)
@@ -235,7 +235,7 @@ cleanup_stages() {
 			;;
 	esac
 	case ${clst_target} in
-		stage1|stage2|stage3|system)
+		stage1|stage2|stage3)
 			rm -f /var/lib/portage/world
 			touch /var/lib/portage/world
 			;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     ea604922797170fb5486b98c30c343de3e981905
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 03:10:39 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 03:54:44 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ea604922

targets: Specify the virtual/cdrtools, not providers

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 62ed0088..f7358b3c 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -21,7 +21,7 @@ case ${clst_hostarch} in
                 ;;
 	*)
 		cdmaker="mkisofs"
-		cdmakerpkg="app-cdr/cdrkit or app-cdr/cdrtools"
+		cdmakerpkg="virtual/cdrtools"
 		;;
 esac
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     3706c667f1997f1b4f8c2d907d6cd15aa8fc805a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 31 03:05:55 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 03:54:44 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3706c667

targets: Add powerpc* to case statement

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index ed581763..62ed0088 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -15,7 +15,7 @@ case ${clst_hostarch} in
    		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
-        ppc*)
+        ppc*|powerpc*)
                 cdmaker="grub-mkrescue"
                 cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
                 ;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6ea0ef2013c2137f7f1f6f1a5f675f42d2a16d64
Author:     Christos Kotsi <christo.kotsi <AT> gmail <DOT> com>
AuthorDate: Wed Apr 12 08:43:47 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:38:17 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6ea0ef20

targets: Simplify code with loops

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 12 +++++-------
 targets/support/livecdfs-update.sh  |  7 +++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 68e1355e..051adc28 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -191,15 +191,13 @@ case ${clst_hostarch} in
 			echo "prompt 1" >> ${icfg}
 			echo "display boot.msg" >> ${icfg}
 			echo "F1 kernels.msg" >> ${icfg}
-			echo "F2 F2.msg" >> ${icfg}
-			echo "F3 F3.msg" >> ${icfg}
-			echo "F4 F4.msg" >> ${icfg}
-			echo "F5 F5.msg" >> ${icfg}
-			echo "F6 F6.msg" >> ${icfg}
-			echo "F7 F7.msg" >> ${icfg}
+			for k in {2..7}
+			do
+				echo "F${k} F${k}.msg" >> ${icfg}
+			done
 
 			echo "Available kernels:" > ${kmsg}
-			for i in 2 3 4 5 6 7
+			for i in {2..7}
 			do
 				cp ${clst_sharedir}/livecd/files/x86-F$i.msg \
 					$1/isolinux/F$i.msg

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 0f39eab0..4156624c 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -68,10 +68,9 @@ fi
 
 # Setup links for ethernet devices
 cd /etc/init.d
-ln -sf net.lo net.eth1
-ln -sf net.lo net.eth2
-ln -sf net.lo net.eth3
-ln -sf net.lo net.eth4
+for i in {1..4}; do
+	ln -sf net.lo net.eth${i}
+done
 
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     4e910d3734eaba7b8467a96a82098b8a7013dbc3
Author:     Christos Kotsi <christo.kotsi <AT> gmail <DOT> com>
AuthorDate: Wed Apr 12 08:43:49 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:38:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4e910d37

targets: Use mkdir -p

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/netboot2-final.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index ebd51878..e6566a1e 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -3,13 +3,11 @@
 source ${clst_shdir}/support/functions.sh
 source ${clst_shdir}/support/filesystem-functions.sh
 
-
 extract_kernels ${clst_target_path}/boot
 
 # Move kernel binaries to ${clst_target_path}/kernels, and
 # move everything else to ${clst_target_path}/kernels/misc
-mkdir ${clst_target_path}/kernels
-mkdir ${clst_target_path}/kernels/misc
+mkdir -p ${clst_target_path}/kernels/misc
 
 for x in ${clst_boot_kernel}; do
 	mv ${clst_target_path}/boot/${x} ${clst_target_path}/kernels

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     46322490b543105aa561933d678368082ccc096d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 03:47:06 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 04:21:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=46322490

targets: Fix expected System.map name

This fixes a regression that broke netboot2 on SPARC.

Fixes: 23cd0ed7dc8a (netboot2.sh: Fix missing slashes in paths)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/netboot2-final.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 28b0d005..52b85f05 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -50,7 +50,7 @@ case ${clst_hostarch} in
 		fi
 		for x in ${clst_boot_kernel}; do
 			elftoaout ${clst_target_path}/kernels/${x} -o ${clst_target_path}/${x}-a.out
-			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System.map-${x} ${clst_target_path}/kernels/misc/${x}.igz
+			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
 	ia64)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5ce5dafb2557fe50c4c860a6049fc804ec4f2304
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 03:45:05 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 04:21:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5ce5dafb

targets: Remove gentoo-config

Not critical, but its presence causes the rmdir to fail.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/netboot2-final.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index e6566a1e..28b0d005 100755
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -15,6 +15,7 @@ for x in ${clst_boot_kernel}; do
 	mv ${clst_target_path}/boot/System-${x}.map ${clst_target_path}/kernels/misc
 done
 
+rm -f ${clst_target_path}/boot/gentoo-config
 rmdir ${clst_target_path}/boot
 
 # Any post-processing necessary for each architecture can be done here.  This

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     b28b3ce7a4aca0cd79236133fbe69b8769c0c194
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 03:43:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 04:21:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b28b3ce7

targets: Use mkdir -p

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 051adc28..154874d5 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -291,9 +291,7 @@ case ${clst_hostarch} in
 		# CD image, and then pass these components to the
 		# `sgibootcd` tool which outputs a final CD image
 		scratch="${1}"
-		[ ! -d "${scratch}/kernels" ] && mkdir ${scratch}/kernels
-		[ ! -d "${scratch}/kernels/misc" ] && mkdir ${scratch}/kernels/misc
-		[ ! -d "${scratch}/arcload" ] && mkdir ${scratch}/arcload
+		mkdir -p mkdir ${scratch}/{kernels/misc,arcload}
 		echo "" > ${scratch}/arc.cf
 
 		# Move kernel binaries to ${scratch}/kernels, and

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5c02fff672f47cd5a04d473944bb82b48a973527
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  1 03:43:54 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr  1 04:21:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5c02fff6

targets: Build and use binpkgs for linux deps

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 754a129f..97d18fe7 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -212,7 +212,7 @@ then
 
 	# install dependencies of kernel sources ahead of time in case
 	# package.provided generated below causes them not to be (re)installed
-	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1
+	PKGDIR=${PKGDIR} clst_myemergeopts="--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps" run_merge "${clst_ksource}" || exit 1
 
 	# Create the kerncache directory if it doesn't exists
 	mkdir -p /tmp/kerncache/${clst_kname}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     a2ba0bda5c5a38a2f34d1a26002d3f4f73776f48
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 07:46:55 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 07:47:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a2ba0bda

targets: Add missing "in"

Fixes: a55e0890b809 (targets: Switch from SILO to GRUB on SPARC)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 6d95c398..9b10b7cf 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -226,7 +226,7 @@ case ${clst_hostarch} in
 		esac
 	;;
 	ppc*|powerpc*|sparc*)
-		case ${clst_hostarch}
+		case ${clst_hostarch} in
 		sparc*) extra_opts="--sparc-boot" ;;
 		esac
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     f96315aee2073ef1d2a52c92c24a05dce4c0e6dc
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 04:13:47 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 07:47:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f96315ae

targets: Remove second argument from exec_in_chroot()

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/functions.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 88e9ad3b..a256a30c 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -16,20 +16,19 @@ delete_from_chroot(){
 	fi
 }
 
-exec_in_chroot(){
 # Takes the full path to the source file as its argument
 # copies the file to the /tmp directory of the chroot
 # and executes it.
+exec_in_chroot() {
 	local file_name=$(basename ${1})
-	local subdir=${2}
-	local destdir="${subdir}/tmp"
+	local destdir="/tmp"
 
 	echo "Copying ${file_name} to ${destdir}"
 	copy_to_chroot ${1} ${destdir}
 	copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
 		${destdir}
 
-	chroot_path=${clst_chroot_path}${subdir}
+	chroot_path=${clst_chroot_path}
 
 	echo "Ensure the file has the executable bit set"
 	chmod +x ${chroot_path}/${destdir}/${file_name}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     aa1f74d71970c74b8bce1d25ea16f8aa24ffeb6c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 05:25:23 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 07:47:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=aa1f74d7

targets: Inline chroot_path variable

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/functions.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 1268b0d1..d3414f80 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -19,20 +19,17 @@ exec_in_chroot() {
 	copy_to_chroot ${1}
 	copy_to_chroot ${clst_shdir}/support/chroot-functions.sh
 
-	chroot_path=${clst_chroot_path}
-
 	# Ensure the file has the executable bit set
-	chmod +x ${chroot_path}/tmp/${file_name}
+	chmod +x ${clst_chroot_path}/tmp/${file_name}
 
 	echo "Running ${file_name} in chroot:"
-	echo "    ${clst_CHROOT} ${chroot_path} /tmp/${file_name}"
-	${clst_CHROOT} "${chroot_path}" "/tmp/${file_name}" || exit 1
+	echo "    ${clst_CHROOT} ${clst_chroot_path} /tmp/${file_name}"
+	${clst_CHROOT} "${clst_chroot_path}" "/tmp/${file_name}" || exit 1
 
 	delete_from_chroot /tmp/${file_name}
 	delete_from_chroot /tmp/chroot-functions.sh
 }
 
-#return codes
 die() {
 	echo "$1"
 	exit 1

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     3aebcea42d11dd507edb2b2ecca2c3053ee2d435
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 03:44:43 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 07:47:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3aebcea4

targets: Remove some unnecessary echos

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/functions.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index a256a30c..fd446b4b 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -4,14 +4,12 @@ copy_to_chroot() {
 	local src_file=$1
 	local dest_dir=${clst_chroot_path}${2:-/tmp}
 	mkdir -p ${dest_dir}
-	echo "copying ${src_file##*/} to ${dest_dir}"
 	cp -pPR "${src_file}" "${dest_dir}"/
 }
 
 delete_from_chroot(){
 	if [ -e ${clst_chroot_path}${1} ]
 	then
-		echo "removing ${clst_chroot_path}${1} from the chroot"
 		rm -f ${clst_chroot_path}${1}
 	fi
 }
@@ -23,14 +21,13 @@ exec_in_chroot() {
 	local file_name=$(basename ${1})
 	local destdir="/tmp"
 
-	echo "Copying ${file_name} to ${destdir}"
 	copy_to_chroot ${1} ${destdir}
 	copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
 		${destdir}
 
 	chroot_path=${clst_chroot_path}
 
-	echo "Ensure the file has the executable bit set"
+	# Ensure the file has the executable bit set
 	chmod +x ${chroot_path}/${destdir}/${file_name}
 
 	echo "Running ${file_name} in chroot:"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     3b8a53d497f26160a27c3288b89f0ae0a770e6df
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 04:12:15 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 07:47:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3b8a53d4

targets: Simplify copy_to_chroot()

Move the mkdir outside of the function, when it's actually needed. This
allows the destination argument to be a file rather than a directory.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/functions.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 5ab64726..5cbecb40 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,10 +1,9 @@
 #!/bin/bash
 
 copy_to_chroot() {
-	local src_file=$1
-	local dest_dir=${clst_chroot_path}${2:-/tmp}
-	mkdir -p ${dest_dir}
-	cp -pPR "${src_file}" "${dest_dir}"/
+	local src="${1}"
+	local dst="${clst_chroot_path}/${2:-/tmp}"
+	cp -pPR "${src}" "${dst}"
 }
 
 delete_from_chroot() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     2a02561c318d54cc2333ddb0815f7403387825eb
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  3 05:28:58 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr  3 07:47:45 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2a02561c

targets: Simplify exec_in_chroot()

Inline the destdir variable since it is a constant, and since /tmp is
the default destination in copy_to_chroot() we can remove it.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/functions.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 5cbecb40..1268b0d1 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -15,23 +15,21 @@ delete_from_chroot() {
 # and executes it.
 exec_in_chroot() {
 	local file_name=$(basename ${1})
-	local destdir="/tmp"
 
-	copy_to_chroot ${1} ${destdir}
-	copy_to_chroot ${clst_shdir}/support/chroot-functions.sh \
-		${destdir}
+	copy_to_chroot ${1}
+	copy_to_chroot ${clst_shdir}/support/chroot-functions.sh
 
 	chroot_path=${clst_chroot_path}
 
 	# Ensure the file has the executable bit set
-	chmod +x ${chroot_path}/${destdir}/${file_name}
+	chmod +x ${chroot_path}/tmp/${file_name}
 
 	echo "Running ${file_name} in chroot:"
-	echo "    ${clst_CHROOT} ${chroot_path} ${destdir}/${file_name}"
-	${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
+	echo "    ${clst_CHROOT} ${chroot_path} /tmp/${file_name}"
+	${clst_CHROOT} "${chroot_path}" "/tmp/${file_name}" || exit 1
 
-	delete_from_chroot ${destdir}/${file_name}
-	delete_from_chroot ${destdir}/chroot-functions.sh
+	delete_from_chroot /tmp/${file_name}
+	delete_from_chroot /tmp/chroot-functions.sh
 }
 
 #return codes

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     9ae5e17abc68907a0c8d75e16c29a84bb48c5e61
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 17:24:38 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 17:25:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9ae5e17a

targets: Just make directory; don't bother checking

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 2c69419d..c52e0907 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -233,8 +233,7 @@ case ${clst_hostarch} in
 		# GRUB2
 		if [ -d $1/grub ] || [ -f "$1/boot/EFI/BOOT/BOOTX64.EFI" ]
 		then
-			#the grub dir may not exist, better safe than sorry
-			[ -d "$1/grub" ] || mkdir -p "$1/grub"
+			mkdir -p "$1/grub"
 
 			iacfg=$1/grub/grub.cfg
 			echo 'set default=0' > ${iacfg}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     e41b9e40c8d20fab3be2b9a1c071cefbf37341c0
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  7 17:24:00 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr  7 17:25:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e41b9e40

targets: Fix copy-n-paste mistake

Fixes: b28b3ce7a4ac (targets: Use mkdir -p)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index db5860d5..2c69419d 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -267,7 +267,7 @@ case ${clst_hostarch} in
 		# CD image, and then pass these components to the
 		# `sgibootcd` tool which outputs a final CD image
 		scratch="${1}"
-		mkdir -p mkdir ${scratch}/{kernels/misc,arcload}
+		mkdir -p ${scratch}/{kernels/misc,arcload}
 		echo "" > ${scratch}/arc.cf
 
 		# Move kernel binaries to ${scratch}/kernels, and

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     3c91b38b9971e76c20acbbb92104818f50cc9876
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 06:55:31 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=3c91b38b

targets: Remove portdir entry from livecd's fstab

It was originally added in commit f325a622f17c (Forward-porting portage
tmpfs mounting ...) in 2005 without much explanation. Something about
the Gentoo installer, I think? Regardless, now all it does is trigger an
error message on boot since stagebase.py deletes the directory.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 4156624c..03138b0b 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -84,7 +84,6 @@ echo "####################################################" >> /etc/fstab
 
 # fstab tweaks
 echo "tmpfs	/					tmpfs	defaults	0 0" >> /etc/fstab
-echo "tmpfs	${clst_repo_basedir}/${clst_repo_name}			tmpfs	defaults	0 0" >> /etc/fstab
 # If /usr/lib/X11/xkb/compiled then make it tmpfs
 if [ -d /usr/lib/X11/xkb/compiled ]
 then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5262bd449e118a134d7b49fa6dea6765a545dc0b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 07:04:18 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5262bd44

targets: Remove some extremely dated comments

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 26be00b0..1630a8f0 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -35,7 +35,6 @@ then
 	default_comment="Default LiveCD User"
 	[ -z "${user_comment}" ] && user_comment=${default_comment}
 
-	# Here we check to see if games exists for bug #125498
 	if [ "$(getent group games | cut -d: -f1)" != "games" ]
 	then
 		echo "Adding games group"
@@ -75,8 +74,6 @@ done
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig
 
-# Tweak the livecd fstab so that users know not to edit it
-# https://bugs.gentoo.org/60887
 echo "####################################################" > /etc/fstab
 echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD	##" >> /etc/fstab
 echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab
@@ -85,8 +82,6 @@ echo "####################################################" >> /etc/fstab
 # fstab tweaks
 echo "tmpfs	/					tmpfs	defaults	0 0" >> /etc/fstab
 
-# Tweak the livecd make.conf so that users know not to edit it
-# https://bugs.gentoo.org/144647
 mv ${clst_make_conf} ${clst_make_conf}.old
 echo "####################################################" >> ${clst_make_conf}
 echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> ${clst_make_conf}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     4bf2e6918b60b058b0fd2085de28470268f23754
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 06:57:41 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4bf2e691

targets: Remove /usr/lib/X11/xkb/compiled reference

This directory has not existed in probably 15 years.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 03138b0b..26be00b0 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -84,12 +84,6 @@ echo "####################################################" >> /etc/fstab
 
 # fstab tweaks
 echo "tmpfs	/					tmpfs	defaults	0 0" >> /etc/fstab
-# If /usr/lib/X11/xkb/compiled then make it tmpfs
-if [ -d /usr/lib/X11/xkb/compiled ]
-then
-	echo "tmpfs	/usr/lib/X11/xkb/compiled	tmpfs	defaults	0 0" >> \
-		/etc/fstab
-fi
 
 # Tweak the livecd make.conf so that users know not to edit it
 # https://bugs.gentoo.org/144647

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     23148d3c59f625d0d5135f80d57dfc70ec67b854
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 07:10:49 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 18:47:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=23148d3c

targets: Use heredocs

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 1630a8f0..d0a76a92 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -74,31 +74,37 @@ done
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig
 
-echo "####################################################" > /etc/fstab
-echo "## ATTENTION: THIS IS THE FSTAB ON THE LIVECD	##" >> /etc/fstab
-echo "## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##" >> /etc/fstab
-echo "####################################################" >> /etc/fstab
+cat <<EOF > /etc/fstab
+####################################################
+## ATTENTION: THIS IS THE FSTAB ON THE LIVECD     ##
+## PLEASE EDIT THE FSTAB at /mnt/gentoo/etc/fstab ##
+####################################################
 
 # fstab tweaks
-echo "tmpfs	/					tmpfs	defaults	0 0" >> /etc/fstab
+tmpfs	/					tmpfs	defaults	0 0
+EOF
 
 mv ${clst_make_conf} ${clst_make_conf}.old
-echo "####################################################" >> ${clst_make_conf}
-echo "## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##" >> ${clst_make_conf}
-echo "## PLEASE EDIT /mnt/gentoo${clst_make_conf} INSTEAD  ##" >> ${clst_make_conf}
-echo "####################################################" >> ${clst_make_conf}
+cat <<EOF > ${clst_make_conf}
+####################################################
+## ATTENTION: THIS IS THE MAKE.CONF ON THE LIVECD ##
+## PLEASE EDIT /mnt/gentoo${clst_make_conf} INSTEAD  ##
+####################################################
+EOF
 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
-echo "alias mv='mv -i'" >> /etc/profile
-echo "alias rm='rm -i'" >> /etc/profile
-echo "alias ls='ls --color=auto'" >> /etc/profile
-echo "alias ll='ls -l'" >> /etc/profile
-echo "alias grep='grep --color=auto'" >> /etc/profile
+cat <<EOF > /etc/profile
+alias cp='cp -i'
+alias mv='mv -i'
+alias rm='rm -i'
+alias ls='ls --color=auto'
+alias ll='ls -l'
+alias grep='grep --color=auto'
+EOF
 
 # Make sure we have the latest pci,usb and hotplug ids.  Older versions of
 # pciutils and usbutils used /sbin, where newer versions use /usr/sbin.

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     4c3d1f23dc6d01ea3603ed3584cd9f57c72bccec
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 01:53:45 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 19:23:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4c3d1f23

targets: Support isoroot checksum on more platforms

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b32c669e..955fedd0 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -118,6 +118,8 @@ run_mkisofs() {
 # Here we actually create the ISO images for each architecture
 case ${clst_hostarch} in
 	alpha)
+		isoroot_checksum
+
 		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
 		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J ${mkisofs_zisofs_opts} -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
@@ -219,6 +221,8 @@ case ${clst_hostarch} in
 		esac
 	;;
 	ppc*|powerpc*|sparc*)
+		isoroot_checksum
+
 		case ${clst_hostarch} in
 		sparc*) extra_opts="--sparc-boot" ;;
 		esac

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     77d740ccdb80cbe368e0bf6169298670cbe811a9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 01:50:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 19:23:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=77d740cc

targets: Move isoroot verify check into isoroot_checksum()

This will simplify the callers.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8c0da181..b32c669e 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -97,6 +97,8 @@ fi
 # Generate list of checksums that genkernel can use to verify the contents of
 # the ISO
 isoroot_checksum() {
+	[ -z "${clst_livecd_verify}" ] && return
+
 	echo ">> Creating checksums for all files included in the ISO"
 
 	pushd "${clst_target_path}"
@@ -107,7 +109,7 @@ isoroot_checksum() {
 }
 
 run_mkisofs() {
-	[ -n "${clst_livecd_verify}" ] && isoroot_checksum
+	isoroot_checksum
 
 	echo "Running \"mkisofs ${@}\""
 	mkisofs "${@}" || die "Cannot make ISO image"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     87f08d2cd8c8eb91f6458e36fcb52fce30492256
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 01:33:33 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 19:23:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=87f08d2c

targets: Simplify isoroot_checksum()

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index b0e4d15e..8c0da181 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -98,8 +98,12 @@ fi
 # the ISO
 isoroot_checksum() {
 	echo ">> Creating checksums for all files included in the ISO"
-	find "${clst_target_path}" -type f ! -name 'isoroot_b2sums' -exec b2sum {} + > "${clst_target_path}"/isoroot_b2sums
-	${clst_sed} -i "s#${clst_target_path}/\?##" "${clst_target_path}"/isoroot_b2sums
+
+	pushd "${clst_target_path}"
+	find -type f -exec b2sum {} + > /tmp/isoroot_b2sums
+	popd
+
+	mv /tmp/isoroot_b2sums "${clst_target_path}"/
 }
 
 run_mkisofs() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     fac8e9ffeccfba8b8ab990fdb1238b6fa488a4f5
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 06:16:37 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 06:16:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fac8e9ff

targets: Do not verification hash for isolinux.bin

I originally expected commit 9560022e2734 (targets: Drop SHA512 isoroot
verification support) to appear after I dropped isolinux.

Fixes: 9560022e2734 (targets: Drop SHA512 isoroot verification support)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index d3e20169..793ed606 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -106,7 +106,7 @@ isoroot_checksum() {
 	echo ">> Creating checksums for all files included in the ISO"
 
 	pushd "${clst_target_path}"
-	find -type f -exec b2sum {} + > /tmp/isoroot_b2sums
+	find -type f ! -name 'isolinux.bin' -exec b2sum {} + > /tmp/isoroot_b2sums
 	popd
 
 	mv /tmp/isoroot_b2sums "${clst_target_path}"/

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     48449b7a38dcc3532adbf24677cd3c61f906c307
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 04:53:32 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 05:37:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=48449b7a

targets: Rearrange code in preparation

... for combining the grub.cfg generation code.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 78 ++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 52c3508d..0e6a7383 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -80,45 +80,6 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	ia64|ppc*|powerpc*|sparc*)
-		kern_subdir=/boot
-		iacfg=$1/boot/grub/grub.cfg
-		mkdir -p $1/boot/grub
-		echo 'set default=0' > ${iacfg}
-		echo 'set gfxpayload=keep' >> ${iacfg}
-		echo 'set timeout=10' >> ${iacfg}
-		echo 'insmod all_video' >> ${iacfg}
-		echo '' >> ${iacfg}
-		for x in ${clst_boot_kernel}
-		do
-			eval "clst_kernel_console=\$clst_boot_kernel_${x}_console"
-			eval custom_kopts=\$${x}_kernelopts
-
-			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
-			echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
-			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
-			echo "}" >> ${iacfg}
-			echo "" >> ${iacfg}
-			echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
-			echo "	linux ${kern_subdir}/${x} ${default_append_line} docache" >> ${iacfg}
-			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
-			echo "}" >> ${iacfg}
-			if [ -n "${clst_kernel_console}" ]
-			then
-			echo "submenu 'Special console options (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg}
-				for y in ${clst_kernel_console}
-				do
-					echo "menuentry 'Boot LiveCD (kernel: ${x} console=${y})' --class gnu-linux --class os {"  >> ${iacfg}
-					echo "	linux ${kern_subdir}/${x} ${default_append_line} console=${y}" >> ${iacfg}
-					echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
-					echo "}" >> ${iacfg}
-					echo "" >> ${iacfg}
-				done
-				echo "}" >> ${iacfg}
-			fi
-			echo "" >> ${iacfg}
-		done
-	;;
 	x86|amd64)
 		if [ -e $1/isolinux/isolinux.bin ]
 		then
@@ -220,6 +181,45 @@ case ${clst_hostarch} in
 			done
 		fi
 	;;
+	ia64|ppc*|powerpc*|sparc*)
+		kern_subdir=/boot
+		iacfg=$1/boot/grub/grub.cfg
+		mkdir -p $1/boot/grub
+		echo 'set default=0' > ${iacfg}
+		echo 'set gfxpayload=keep' >> ${iacfg}
+		echo 'set timeout=10' >> ${iacfg}
+		echo 'insmod all_video' >> ${iacfg}
+		echo '' >> ${iacfg}
+		for x in ${clst_boot_kernel}
+		do
+			eval "clst_kernel_console=\$clst_boot_kernel_${x}_console"
+			eval custom_kopts=\$${x}_kernelopts
+
+			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
+			echo "	linux ${kern_subdir}/${x} ${default_append_line}" >> ${iacfg}
+			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+			echo "}" >> ${iacfg}
+			echo "" >> ${iacfg}
+			echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
+			echo "	linux ${kern_subdir}/${x} ${default_append_line} docache" >> ${iacfg}
+			echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+			echo "}" >> ${iacfg}
+			if [ -n "${clst_kernel_console}" ]
+			then
+			echo "submenu 'Special console options (kernel: ${x})' --class gnu-linux --class os {" >> ${iacfg}
+				for y in ${clst_kernel_console}
+				do
+					echo "menuentry 'Boot LiveCD (kernel: ${x} console=${y})' --class gnu-linux --class os {"  >> ${iacfg}
+					echo "	linux ${kern_subdir}/${x} ${default_append_line} console=${y}" >> ${iacfg}
+					echo "	initrd ${kern_subdir}/${x}.igz" >> ${iacfg}
+					echo "}" >> ${iacfg}
+					echo "" >> ${iacfg}
+				done
+				echo "}" >> ${iacfg}
+			fi
+			echo "" >> ${iacfg}
+		done
+	;;
 	mips)
 		# NO SOFTLEVEL SUPPORT YET
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6d0cbf4d3a54848d24daec21bb2a5eed60fe278f
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 10 04:54:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 10 06:09:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6d0cbf4d

targets: Share grub.cfg generation code

To do this, I had to fix what looks like a mistake to me: grub.cfg was
written to /grub/grub.cfg instead of /boot/grub/grub.cfg.

The "boot/kernel/<label>/console" spec option is supported by the other
grub.cfg generation path, so we now get it on x86/amd64 as well.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 28 +---------------------------
 targets/support/functions.sh        |  2 +-
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 0e6a7383..2119e521 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -154,33 +154,7 @@ case ${clst_hostarch} in
 			echo "  localboot -1" >> $icfg
 			echo "  MENU HIDE" >> $icfg
 		fi
-
-		# GRUB2
-		if [ -d $1/grub ] || [ -f "$1/boot/EFI/BOOT/BOOTX64.EFI" ]
-		then
-			mkdir -p "$1/grub"
-
-			iacfg=$1/grub/grub.cfg
-			echo 'set default=0' > ${iacfg}
-			echo 'set gfxpayload=keep' >> ${iacfg}
-			echo 'set timeout=10' >> ${iacfg}
-			echo 'insmod all_video' >> ${iacfg}
-			echo '' >> ${iacfg}
-			for x in ${clst_boot_kernel}
-			do
-				echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
-				echo "	linux /boot/${x} ${default_append_line}" >> ${iacfg}
-				echo "	initrd /boot/${x}.igz" >> ${iacfg}
-				echo "}" >> ${iacfg}
-				echo "" >> ${iacfg}
-				echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
-				echo "	linux /boot/${x} ${default_append_line} docache" >> ${iacfg}
-				echo "	initrd /boot/${x}.igz" >> ${iacfg}
-				echo "}" >> ${iacfg}
-				echo "" >> ${iacfg}
-			done
-		fi
-	;;
+	;&
 	ia64|ppc*|powerpc*|sparc*)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index d3414f80..9da13baf 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -93,7 +93,7 @@ create_bootloader() {
   echo "insmod part_gpt" > grub-stub.cfg
   echo "insmod part_msdos" >> grub-stub.cfg
   echo "search --no-floppy --set=root --file /livecd" >> grub-stub.cfg
-  echo "configfile /grub/grub.cfg" >> grub-stub.cfg
+  echo "configfile /boot/grub/grub.cfg" >> grub-stub.cfg
 
   # some 64 bit machines have 32 bit UEFI, and you might want to boot 32 bit on a 64 bit machine, so we take the safest path and include both
   # set up 32 bit uefi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6e7285018213303f3147227d464c544be204ec96
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 12 01:59:11 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 12 03:54:21 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6e728501

targets: Test clst_hostarch, not clst_buildarch

We care about what the host system is (the one the stage is going to run
on), not the system that is building it.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 2119e521..1564d74a 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -10,7 +10,7 @@ source ${clst_shdir}/support/filesystem-functions.sh
 if [ -n "${clst_cdtar}" ]
 then
 	extract_cdtar $1
-elif [ "${clst_buildarch}" = "x86" ] || [ "${clst_buildarch}" = "amd64" ]
+elif [ "${clst_hostarch}" = "x86" ] || [ "${clst_hostarch}" = "amd64" ]
 then
 	#assume if there is no cdtar and we are on a supported arch that the user just wants us to handle this
 	create_bootloader $1

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     25c158df771eecadefc0d1cb591938780a8cbf4d
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 17 19:56:16 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Apr 17 19:57:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=25c158df

create-iso.sh: actually fix du ESP size calculation on x86/amd64

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 793ed606..01b06501 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -220,7 +220,7 @@ case ${clst_hostarch} in
 					mv "${clst_target_path}/boot/efi" "${clst_target_path}/boot/EFI"
 				fi
 				# prepare gentoo.efimg from clst_target_path /boot/EFI dir
-				iaSizeTemp=$(du -sk "${clst_target_path}/boot/EFI" 2>/dev/null)
+				iaSizeTemp=$(du -sk --apparent-size "${clst_target_path}/boot/EFI" 2>/dev/null)
 				iaSizeB=$(echo ${iaSizeTemp} | cut '-d ' -f1)
 				iaSize=$((${iaSizeB}+64)) # add slack, tested near minimum for overhead
 				echo "Creating loopback file of size ${iaSize}kB"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Rick Farina]

commit:     711cf07b2501faea4075ebfb8dd7c65a11c5964d
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 16:15:07 2020 +0000
Commit:     Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 16:15:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=711cf07b

append to /etc/profile instead of overwrite

Signed-off-by: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 046473df..b1049671 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -97,7 +97,7 @@ cat ${clst_make_conf}.old >> ${clst_make_conf}
 [ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
 
 # Add some helpful aliases
-cat <<EOF > /etc/profile
+cat <<EOF >> /etc/profile
 alias cp='cp -i'
 alias mv='mv -i'
 alias rm='rm -i'

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     df366b28049fd58f4371942cb53279f03b771855
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 06:40:26 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May  4 02:42:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=df366b28

targets: Inline filesystem-functions.sh

Inline create_squashfs and create_jffs2 since they're called only from
one place (in a different file).

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/filesystem-functions.sh | 19 -------------------
 targets/support/target_image_setup.sh   | 20 ++++++--------------
 2 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
deleted file mode 100755
index d82be45a..00000000
--- a/targets/support/filesystem-functions.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Dont forget to update functions.sh  check_looptype
-# $1 is the target directory for the filesystem
-
-create_squashfs() {
-	echo "Creating squashfs..."
-	export loopname="image.squashfs"
-	gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "$1/${loopname}" \
-		|| die "gensquashfs failed, did you emerge squashfs-tools-ng?"
-}
-
-create_jffs2(){
-	echo "Creating jffs2..."
-	export loopname="image.jffs"
-	# fs_check /usr/sbin/mkfs.jffs2 jffs2 sys-fs/mtd
-	mkfs.jffs2 --root=${clst_destpath} --output=$1/${loopname} ${clst_fsops} \
-		|| die "Could not create a jffs2 filesystem"
-}

diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index 423dc4c4..fdc4a234 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,25 +1,17 @@
 #!/bin/bash
 
 source ${clst_shdir}/support/functions.sh
-source ${clst_shdir}/support/filesystem-functions.sh
 
-# Make the directory if it doesnt exist
-mkdir -p $1
+mkdir -p "${1}"
 
-loopret=1
+echo "Creating ${clst_fstype} filesystem"
 case ${clst_fstype} in
 	squashfs)
-		create_squashfs $1
-		loopret=$?
+		gensquashfs -D "${clst_destpath}" -q ${clst_fsops} "${1}/image.squashfs" \
+			|| die "Failed to create squashfs filesystem"
 	;;
 	jffs2)
-		create_jffs2 $1
-		loopret=$?
+		mkfs.jffs2 --root="${clst_destpath}" --output="${1}/image.jffs" "${clst_fsops}" \
+			|| die "Failed to create jffs2 filesystem"
 	;;
 esac
-
-if [ ${loopret} = "1" ]
-then
-	die "Filesystem not setup"
-fi
-exit $loopret

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     8d3c16b80b554541166ae52adfc38fb1823f2f25
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 06:47:29 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May  4 02:42:54 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8d3c16b8

targets: Remove unused run_crossdev() function

Has never been used in its entire existence.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/functions.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index daf6f190..601f5dc9 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -238,7 +238,3 @@ check_filesystem_type(){
 		;;
 	esac
 }
-
-run_crossdev() {
-	crossdev ${clst_CHOST}
-}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     029f7879f84e515887edcc8fc97e287ec413a7ba
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May  1 06:46:52 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon May  4 02:43:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=029f7879

targets: Inline functions with one caller

Inline check_bootargs and check_filesystem_type since they have only one
caller (in a different file).

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 21 +++++++++++++++++++--
 targets/support/functions.sh        | 22 ----------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index d507fe5e..d3a6b2dc 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -19,8 +19,25 @@ else
 fi
 
 extract_kernels $1/boot
-check_bootargs
-check_filesystem_type
+
+# Add any additional options
+if [ -n "${clst_livecd_bootargs}" ]
+then
+	for x in ${clst_livecd_bootargs}
+	do
+		cmdline_opts="${cmdline_opts} ${x}"
+	done
+fi
+
+case ${clst_fstype} in
+	squashfs)
+		cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs"
+	;;
+	jffs2)
+		cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2"
+	;;
+esac
+
 
 default_append_line="root=/dev/ram0 init=/linuxrc ${cmdline_opts} ${custom_kopts} cdroot"
 [ -n "${clst_splash_theme}" ] && default_append_line="${default_append_line} splash=silent,theme:${clst_livecd_splash_theme} CONSOLE=/dev/tty1 quiet"

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 601f5dc9..ac6710ad 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -216,25 +216,3 @@ extract_kernel() {
 		mv ${1}/initramfs-* ${1}/${2}.igz
 	fi
 }
-
-check_bootargs(){
-	# Add any additional options
-	if [ -n "${clst_livecd_bootargs}" ]
-	then
-		for x in ${clst_livecd_bootargs}
-		do
-			cmdline_opts="${cmdline_opts} ${x}"
-		done
-	fi
-}
-
-check_filesystem_type(){
-	case ${clst_fstype} in
-		squashfs)
-			cmdline_opts="${cmdline_opts} looptype=squashfs loop=/image.squashfs"
-		;;
-		jffs2)
-			cmdline_opts="${cmdline_opts} looptype=jffs2 loop=/image.jffs2"
-		;;
-	esac
-}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     421d73ea3ad22bd9cb915f56f1ef4a66fd0c752a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 06:12:21 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:49:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=421d73ea

targets: Don't unnecessarily override emerge_opts

emerge_opts contains the options we want already, and if there are extra
options we need for a special case we can just pass them to run_merge.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 23489d8e..e92072bb 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -212,7 +212,7 @@ then
 
 	# install dependencies of kernel sources ahead of time in case
 	# package.provided generated below causes them not to be (re)installed
-	PKGDIR=${PKGDIR} emerge_opts=(--quiet --usepkg --buildpkg --binpkg-respect-use=y --update --newuse --onlydeps) run_merge "${clst_ksource}" || exit 1
+	PKGDIR=${PKGDIR} run_merge --onlydeps "${clst_ksource}" || exit 1
 
 	# Create the kerncache directory if it doesn't exists
 	mkdir -p /tmp/kerncache/${clst_kname}
@@ -236,7 +236,7 @@ then
 
 	[ -L /usr/src/linux ] && rm -f /usr/src/linux
 
-	PKGDIR=${PKGDIR} emerge_opts=(--quiet --update --newuse) run_merge "${clst_ksource}" || exit 1
+	PKGDIR=${PKGDIR} run_merge "${clst_ksource}" || exit 1
 
 	SOURCESDIR="/tmp/kerncache/${clst_kname}/sources"
 	if [ -L /usr/src/linux ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     76e00418920285d4899ecda1f3cf3edd93ead2e2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 06:23:46 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 16 06:49:51 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=76e00418

targets: Decouple distfile fetching from binary packages

This removes a hack introduced in 2006 to work around a bug in portage
where it wouldn't fetch distfiles if a binary package existed for the
package. Presumably that's been fixed in the intervening 14 years. See
commit 4e00f1338637 (We now only set the options for pkgcache if we are
not using fetchonly.)

Also remove the useless "i++ // increment i"-style comment.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 488041fe..d40279ae 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -152,8 +152,9 @@ setup_emerge_opts() {
 	then
 		emerge_opts+=(--fetchonly)
 		bootstrap_opts+=(-f)
-	# if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs
-	elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
+	fi
+
+	if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ]
 	then
 		emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse)
 		bootstrap_opts+=(-r)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     b4941f10b5ab361c9dbee8a1ed4957cba564eccd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 01:24:58 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 20 01:49:37 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b4941f10

targets: Remove check_genkernel_version() function

Existed to ensure a minimum genkernel version, and was last updated in
2005. genkernel is emerged during the catalyst build now, so we will
always have an updated version.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 23 -----------------------
 targets/support/kmerge.sh           |  2 --
 2 files changed, 25 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index d63e4918..b6e221af 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -29,29 +29,6 @@ if [[ -z "${clst_CHOST}" ]] ; then
 	fi
 fi
 
-check_genkernel_version() {
-	local version parts=() major minor
-
-	version=$(genkernel --version)
-	if [[ -z ${version} ]] ; then
-		echo "ERROR: Could not detect genkernel version!"
-		exit 1
-	fi
-	printf 'Genkernel version '%s' found ... ' "${version}"
-
-	IFS='.' read -a parts <<<"${version}"
-	major=${parts[0]}
-	minor=${parts[1]}
-	if [[ ${major} -gt 3 || ( ${major} -eq 3 && ${minor} -ge 3 ) ]] ; then
-		echo "OK"
-	else
-		echo "FAIL"
-		echo "ERROR: Your genkernel version is too low in your seed stage."
-		echo "       genkernel version 3.3.0 or greater is required."
-		exit 1
-	fi
-}
-
 get_libdir() {
 	ABI=$(portageq envvar ABI)
 	DEFAULT_ABI=$(portageq envvar DEFAULT_ABI)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 1a432293..6b589493 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -2,8 +2,6 @@
 
 source /tmp/chroot-functions.sh
 
-check_genkernel_version
-
 install -d /tmp/kerncache
 PKGDIR=/tmp/kerncache/${clst_kname}/ebuilds
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5a8322accecab68d7b00637f288487354e7a01d3
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 01:20:02 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed May 20 01:49:30 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5a8322ac

targets: Remove copy_{file,symlink,lib} functions

Unused since the removal of the original netboot target.

I'm honestly kind of impressed with the strategy of running ldd and
recursively copying libraries to the netboot image. Unfortunately for
this strategy, dlopen() exists so this cannot work.

Fixes: 89f57e145f82 (targets: Delete the netboot target)
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 75 -------------------------------------
 1 file changed, 75 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index d40279ae..d63e4918 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -335,81 +335,6 @@ run_default_funcs() {
 	fi
 }
 
-# Functions
-# Copy libs of a executable in the chroot
-function copy_libs() {
-	# Check if it's a dynamix exec
-	ldd ${1} > /dev/null 2>&1 || return
-
-	for lib in `ldd ${1} | awk '{ print $3 }'`
-	do
-		echo ${lib}
-		if [ -e ${lib} ]
-		then
-			if [ ! -e ${clst_root_path}/${lib} ]
-			then
-				copy_file ${lib}
-				[ -e "${clst_root_path}/${lib}" ] && \
-				strip -R .comment -R .note ${clst_root_path}/${lib} \
-				|| echo "WARNING : Cannot strip lib ${clst_root_path}/${lib} !"
-			fi
-		else
-			echo "WARNING : Some library was not found for ${lib} !"
-		fi
-	done
-}
-
-function copy_symlink() {
-	STACK=${2}
-	[ "${STACK}" = "" ] && STACK=16 || STACK=$((${STACK} - 1 ))
-
-	if [ ${STACK} -le 0 ]
-	then
-		echo "WARNING : ${TARGET} : too many levels of symbolic links !"
-		return
-	fi
-
-	[ ! -e ${clst_root_path}/`dirname ${1}` ] && \
-		mkdir -p ${clst_root_path}/`dirname ${1}`
-	[ ! -e ${clst_root_path}/${1} ] && \
-		cp -vfdp ${1} ${clst_root_path}/${1}
-
-	if [[ -n $(type -p realpath) ]]; then
-		TARGET=`realpath ${1}`
-	else
-		TARGET=`readlink -f ${1}`
-	fi
-	if [ -h ${TARGET} ]
-	then
-		copy_symlink ${TARGET} ${STACK}
-	else
-		copy_file ${TARGET}
-	fi
-}
-
-function copy_file() {
-	f="${1}"
-
-	if [ ! -e "${f}" ]
-	then
-		echo "WARNING : File not found : ${f}"
-		continue
-	fi
-
-	[ ! -e ${clst_root_path}/`dirname ${f}` ] && \
-		mkdir -p ${clst_root_path}/`dirname ${f}`
-	[ ! -e ${clst_root_path}/${f} ] && \
-		cp -vfdp ${f} ${clst_root_path}/${f}
-	if [ -x ${f} -a ! -h ${f} ]
-	then
-		copy_libs ${f}
-		strip -R .comment -R .note ${clst_root_path}/${f} > /dev/null 2>&1
-	elif [ -h ${f} ]
-	then
-		copy_symlink ${f}
-	fi
-}
-
 create_handbook_icon() {
 	# This function creates a local icon to the Gentoo Handbook
 	echo "[Desktop Entry]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     234286ffae459764e2dfaf55c94e44ec3ad4e9cd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  3 03:20:58 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct  3 03:20:58 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=234286ff

targets: Remove ancient locale-deleting code

This block of code was added in commit ef648688ce8b ("Forward port the
changes from catalyst 1.1.9 to 1.1.10.10 to catalyst2.") in 2005 without
any further explanation. Since locale-gen was first committed to our
glibc package in 2006, we think that locales were handled differently
before (and not packed into /usr/${libdir}/locale/locale-archive).

Not only is this code unneeded, it can actually cause the locale-archive
to be deleted if the livecd is using a multilib profile! E.g. on a
multilib amd64 profile, where /usr/lib/locale is a symlink to
/usr/lib64/locale, it deletes /usr/lib64/locale/l* which matches
/usr/lib64/locale/locale-archive.

Because the minimal livecd uses a non-multilib profile, this explains
why it still contained the expected set of locales, while the multilib
admincd did not.

Thanks go to Ben Kohler, Thomas Deutschmann, and  Andreas Hüttel for
figuring out this mystery!

Bug: https://bugs.gentoo.org/710762
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 53844d9f..557d990b 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -174,13 +174,6 @@ esac
 
 rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/livecd.motd.txt
 
-# Clear out locales
-case ${clst_livecd_type} in
-	gentoo-release-minimal|gentoo-release-universal)
-		rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}*
-	;;
-esac
-
 # Post configuration
 case ${clst_livecd_type} in
 	gentoo-release-live*)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     59ea20315a3df7941b4439dd14746133ac03c069
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 23:30:05 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=59ea2031

targets: Emerge kernel sources with --update

Ensure that we have the appropriate version.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 7eb18313..40e208e4 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -193,7 +193,7 @@ then
 		rm -f ${clst_port_conf}/profile/package.provided
 	fi
 
-	USE=symlink run_merge "${ksource}"
+	USE=symlink run_merge --update "${ksource}"
 
 	SOURCESDIR="/tmp/kerncache/${kname}/sources"
 	if [ -L /usr/src/linux ]
@@ -223,7 +223,7 @@ then
 		fi
 	fi
 else
-	USE=symlink run_merge "${ksource}"
+	USE=symlink run_merge --update "${ksource}"
 
 	if [ ! "${clst_kextraversion}" = "" ]
 	then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     24029c40a07b8e9def8ec5d59010c430c52a50c4
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 19:15:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:09:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=24029c40

targets: Remove unnecessary unset USE

Dead code since 2008.

Fixes: 454c1682 ("Rather than using the environment, we write out our USE to make.conf ...")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index d65b8142..4f82a01f 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -245,7 +245,6 @@ fi
 genkernel_compile
 
 sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf}
-unset USE
 
 if [ -n "${clst_KERNCACHE}" ]
 then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     5af4e00582761330325abdef14f507e8aaa1dc99
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 06:59:20 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5af4e005

targets: Remove wrong make.conf munging

With pkgcache fixed for kernel sources in a prior commit, I noticed that
if a livecd-stage2 built three kernels, the first would emerge normally
and build a binpkg, the second would emerge and fail to use the binpkg
produced earlier, and the third would use a previously produced binpkg.
I discovered the reason is that the second and third emerges are run
after USE="... build" has been added to make.conf. We intentionally
removed this in commit c0fcbf02 ("kmerge.sh: Don't set USE=build for
emerging kernels.") years ago, so I was surprised to find this code.

The commit mentioned below inexplicably (and wrongly) readded USE=build
to make.conf, failed to update the sed command to remove it, and readded
the addition in entirely the wrong spot so it didn't even affect the
kernel merge.

genkernel doesn't source the system's make.conf, so this code would be
entirely useless if it wasn't harmful.

Fixes: 0343a18e ("Fix merging kernel without kerncache enabled.")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 4f82a01f..1209e330 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -238,14 +238,8 @@ $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev
 	fi
 fi
 
-# Update USE flag in make.conf
-[ -e ${clst_make_conf} ] && \
-	echo "USE=\"\${USE} ${kernel_use} build\"" >> ${clst_make_conf}
-
 genkernel_compile
 
-sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf}
-
 if [ -n "${clst_KERNCACHE}" ]
 then
 	echo ${kernel_use} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     ffe1b6669ba37b166ba968c0cc99267f1b1f0aab
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:17:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ffe1b666

targets: Default to sys-kernel/gentoo-sources directly

Using virtual/linux-sources was a nice idea, but leads to multiple
failures in practice. For example, we use 'portageq contents' later, and
the virtual provides no files. We could handle the indirection with
'portageq expand_virtual' in some cases but that requires the virtual to
be installed on the system.

Fixes: 388def77 ("kmerge.sh blows away the /usr/src/linux symlink ...")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 40e208e4..c4136dec 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -118,11 +118,7 @@ eval "kernel_merge=\$clst_boot_kernel_${kname}_packages"
 eval "kernel_use=\$clst_boot_kernel_${kname}_use"
 eval eval kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs )
 eval "ksource=\$clst_boot_kernel_${kname}_sources"
-
-if [ -z "${ksource}" ]
-then
-	ksource="virtual/linux-sources"
-fi
+[[ -z ${ksource} ]] && ksource="sys-kernel/gentoo-sources"
 
 # Check if we have a match in kerncach
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     852b486b445cf9c49800c6052142bde972706c41
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 18:23:47 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:09:16 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=852b486b

targets: Remove bizarre make_destpath() call

The commit that added it says it did so in order to "export ROOT=/ prior
to running genkernel". Why that was necessary is unclear. I can find no
evidence that genkernel needs (or needed) ROOT to be set, and why it
would need ROOT=/ seems even more doubtful.

Fixes: 8fb885ff ("Added an additional make_destpath call to kmerge.sh ...")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 911d7cb3..d65b8142 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -242,8 +242,6 @@ fi
 [ -e ${clst_make_conf} ] && \
 	echo "USE=\"\${USE} ${kernel_use} build\"" >> ${clst_make_conf}
 
-make_destpath
-
 genkernel_compile
 
 sed -i "/USE=\"\${USE} ${kernel_use} \"/d" ${clst_make_conf}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     0fe50361b38be1f7ad67d4172962c4d2f4adb453
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:08:28 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0fe50361

targets: Use USE=symlink when emerging kernel sources

Just use the thing that exists instead of rolling our own...

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 1209e330..7eb18313 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -193,9 +193,7 @@ then
 		rm -f ${clst_port_conf}/profile/package.provided
 	fi
 
-	[ -L /usr/src/linux ] && rm -f /usr/src/linux
-
-	run_merge "${ksource}"
+	USE=symlink run_merge "${ksource}"
 
 	SOURCESDIR="/tmp/kerncache/${kname}/sources"
 	if [ -L /usr/src/linux ]
@@ -225,12 +223,8 @@ then
 		fi
 	fi
 else
-	run_merge "${ksource}"
-	#ensure that there is a /usr/src/linux symlink and it points to the sources we just installed
-	echo "Adjusting /usr/src/linux to point to \
-$(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null)"
-	ln -snf $(portageq contents / $(portageq best_visible / "${ksource}" 2>/dev/null) 2>/dev/null | grep --color=never '/usr/src/' | head -n1 2>/dev/null) \
-		/usr/src/linux
+	USE=symlink run_merge "${ksource}"
+
 	if [ ! "${clst_kextraversion}" = "" ]
 	then
 		echo "Setting extraversion to ${clst_kextraversion}"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     f75188c7dfc1f7682c393d1d4b1b1ad4eae97a36
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:38:06 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f75188c7

targets: Rewrite hppa pre-kmerge check

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/pre-kmerge.sh | 43 +++++++++++++++++--------------------------
 1 file changed, 17 insertions(+), 26 deletions(-)

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index dd51ae9a..165dfd51 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -2,32 +2,23 @@
 
 source /tmp/chroot-functions.sh
 
-case ${clst_hostarch} in
-	hppa)
-		got_32=0
-		got_64=0
-		for i in ${clst_boot_kernel}
-		do
-			if [ "${i: -2}" == "32" ]
-			then
-				if [ $got_32 -eq 1 ]
-				then
-					die "Only one 32 bit kernel can be configured"
-				fi
-				got_32=1
-			elif [ "${i: -2}" == "64" ]
-			then
-				if [ $got_64 -eq 1 ]
-				then
-					die "Only one 64 bit kernel can be configured"
-				fi
-				got_64=1
-			else
-				die "Kernel names must end by either 32 or 64"
-			fi
-		done
-	;;
-esac
+if [[ ${clst_hostarch} == hppa ]]; then
+	for i in ${clst_boot_kernel}; do
+		case ${i} in
+			*32)
+				let num32++
+				;;
+			*64)
+				let num64++
+				;;
+			*)
+				die "Kernel names must end with either \"32\" or \"64\""
+				;;
+		esac
+	done
+	[[ $num32 > 1 ]] && die "Only one 32-bit kernel can be configured"
+	[[ $num64 > 1 ]] && die "Only one 64-bit kernel can be configured"
+fi
 
 run_merge --oneshot genkernel
 install -d /tmp/kerncache

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     97060f608afd21e1463115f46cf2fbc3cee73b5c
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 02:38:39 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=97060f60

targets: Reimplement kerncache support

I cannot see how the code added in commit fed3b45b could have possibly
worked, and in practice it did not.

An earlier commit (beb92087) deleted most or all of the uses of the
*_MATCH variables but left the code that set them in place.

Fixes: beb92087 ("Added patches from Joshua Kinard <kumba <AT> gentoo.org>")
Fixes: fed3b45b ("Fix and improve kernel build when kerncache is enabled.")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 147 +++++++++++++++-------------------------------
 1 file changed, 47 insertions(+), 100 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 6a0137d7..972feb99 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -85,11 +85,6 @@ genkernel_compile() {
 	else
 		genkernel "${GK_ARGS[@]}" || exit 1
 	fi
-	if [ -n "${clst_KERNCACHE}" -a -e /var/tmp/${kname}.config ]
-	then
-		md5sum /var/tmp/${kname}.config | awk '{print $1}' > \
-			/tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.CONFIG
-	fi
 }
 
 [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
@@ -106,117 +101,69 @@ eval eval kernel_gk_kernargs=( \$clst_boot_kernel_${kname}_gk_kernargs )
 eval "ksource=\$clst_boot_kernel_${kname}_sources"
 [[ -z ${ksource} ]] && ksource="sys-kernel/gentoo-sources"
 
-# Check if we have a match in kerncach
-
-if [ -n "${clst_KERNCACHE}" ]
-then
-	USE_MATCH=0
-	if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE ]
-	then
-		STR1=$(for i in `cat /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE`; do echo $i; done|sort)
-		STR2=$(for i in ${kernel_use}; do echo $i; done|sort)
-		if [ "${STR1}" = "${STR2}" ]
-		then
-			USE_MATCH=1
-		else
-			[ -e /tmp/kerncache/${kname}/usr/src/linux/.config ] && \
-				rm /tmp/kerncache/${kname}/usr/src/linux/.config
-		fi
-	fi
-
-	EXTRAVERSION_MATCH=0
-	if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION ]
-	then
-		STR1=`cat /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION`
-		STR2=${clst_kextraversion}
-		if [ "${STR1}" = "${STR2}" ]
-		then
-			EXTRAVERSION_MATCH=1
-		fi
-	fi
-
-	CONFIG_MATCH=0
-	if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.CONFIG ]
-	then
-		if [ ! -e /var/tmp/${kname}.config ]
-		then
-			CONFIG_MATCH=1
-		else
-			STR1=`cat /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.CONFIG`
-			STR2=`md5sum /var/tmp/${kname}.config|awk '{print $1}'`
-			if [ "${STR1}" = "${STR2}" ]
-			then
-				CONFIG_MATCH=1
-			fi
-		fi
-	fi
+kernel_version=$(portageq best_visible / "${ksource}")
 
-	# install dependencies of kernel sources ahead of time in case
-	# package.provided generated below causes them not to be (re)installed
-	run_merge --onlydeps "${ksource}"
+if [[ -n ${clst_KERNCACHE} ]]; then
+	mkdir -p "/tmp/kerncache/${kname}"
+	pushd "/tmp/kerncache/${kname}" >/dev/null
 
-	# Create the kerncache directory if it doesn't exists
-	mkdir -p /tmp/kerncache/${kname}
+	echo "${kernel_use}" > /tmp/USE
+	echo "${kernel_version}" > /tmp/VERSION
+	echo "${clst_kextraversion}" > /tmp/EXTRAVERSION
 
-	if [ -e /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.KERNELVERSION ]
-	then
-		KERNELVERSION=$(</tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.KERNELVERSION)
-		mkdir -p ${clst_port_conf}/profile
-		echo "${KERNELVERSION}" > ${clst_port_conf}/profile/package.provided
-	else
-		rm -f ${clst_port_conf}/profile/package.provided
+	if cmp -s {/tmp/,}USE && \
+	   cmp -s {/tmp/,}VERSION && \
+	   cmp -s {/tmp/,}EXTRAVERSION && \
+	   cmp -s /var/tmp/${kname}.config CONFIG; then
+		cached_kernel_found="true"
 	fi
 
-	# Don't use package.provided if there's a pending up/downgrade
-	if [[ "$(portageq best_visible / ${ksource})" == "${KERNELVERSION}" ]]; then
-		echo "No pending updates for ${ksource}"
-	else
-		echo "Pending updates for ${ksource}, removing package.provided"
-		rm -f ${clst_port_conf}/profile/package.provided
-	fi
+	rm -f /tmp/{USE,VERSION,EXTRAVERSION}
+	popd >/dev/null
+fi
 
+if [[ ! ${cached_kernel_found} ]]; then
 	USE=symlink run_merge --update "${ksource}"
+fi
 
+if [[ -n ${clst_KERNCACHE} ]]; then
 	SOURCESDIR="/tmp/kerncache/${kname}/sources"
-	if [ -L /usr/src/linux ]
-	then
-		# A kernel was merged, move it to $SOURCESDIR
-		[ -e ${SOURCESDIR} ] && rm -Rf ${SOURCESDIR}
-
-		KERNELVERSION=`portageq best_visible / "${ksource}"`
-		echo "${KERNELVERSION}" > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.KERNELVERSION
-
+	if [[ ! ${cached_kernel_found} ]]; then
 		echo "Moving kernel sources to ${SOURCESDIR} ..."
-		mv `readlink -f /usr/src/linux` ${SOURCESDIR}
-	fi
-	ln -sf ${SOURCESDIR} /usr/src/linux
 
-	# If catalyst has set to a empty string, extraversion wasn't specified so we
-	# skip this part
-	if [ "${EXTRAVERSION_MATCH}" = "0" ]
-	then
-		if [ ! "${clst_kextraversion}" = "" ]
-		then
-			echo "Setting extraversion to ${clst_kextraversion}"
-			sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
-			echo ${clst_kextraversion} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION
-		else
-			touch /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.EXTRAVERSION
-		fi
+		rm -rf "${SOURCESDIR}"
+		mv $(readlink -f /usr/src/linux) "${SOURCESDIR}"
 	fi
-else
-	USE=symlink run_merge --update "${ksource}"
+	ln -snf "${SOURCESDIR}" /usr/src/linux
+fi
 
-	if [ ! "${clst_kextraversion}" = "" ]
-	then
-		echo "Setting extraversion to ${clst_kextraversion}"
-		sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" /usr/src/linux/Makefile
+if [[ -n ${clst_kextraversion} ]]; then
+	echo "Setting EXTRAVERSION to ${clst_kextraversion}"
+
+	if [[ -e /usr/src/linux/Makefile.bak ]]; then
+		cp /usr/src/linux/Makefile{.bak,}
+	else
+		cp /usr/src/linux/Makefile{,.bak}
 	fi
+	sed -i -e "s:EXTRAVERSION \(=.*\):EXTRAVERSION \1-${clst_kextraversion}:" \
+		/usr/src/linux/Makefile
 fi
 
 genkernel_compile
 
-if [ -n "${clst_KERNCACHE}" ]
-then
-	echo ${kernel_use} > /tmp/kerncache/${kname}/${kname}-${clst_version_stamp}.USE
+# Write out CONFIG, USE, VERSION, and EXTRAVERSION files
+if [[ -n ${clst_KERNCACHE} && ! ${cached_kernel_found} ]]; then
+	pushd "/tmp/kerncache/${kname}" >/dev/null
+
+	cp /var/tmp/${kname}.config CONFIG
+	echo "${kernel_use}" > USE
+	echo "${kernel_version}" > VERSION
+	echo "${clst_kextraversion}" > EXTRAVERSION
+
+	popd >/dev/null
+fi
+
+if [[ ! ${cached_kernel_found} ]]; then
+	run_merge -C "${ksource}"
+	rm /usr/src/linux
 fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     e96ef61854ae6f85f90dc9f5e01b5e1743c8a6f6
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 02:48:07 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e96ef618

targets: Use double-brackets in kmerge.sh

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 50 ++++++++++++++---------------------------------
 1 file changed, 15 insertions(+), 35 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 5e284183..fb67aba6 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -15,71 +15,51 @@ genkernel_compile() {
 		--minkernpackage=/tmp/kerncache/${kname}-kernel-initrd-${clst_version_stamp}.tar.bz2 all
 	)
 	# extra genkernel options that we have to test for
-	if [ -n "${clst_gk_mainargs}" ]
-	then
+	if [[ -n ${clst_gk_mainargs} ]]; then
 		GK_ARGS+=(${clst_gk_mainargs})
 	fi
-	if [ -n "${clst_KERNCACHE}" ]
-	then
+	if [[ -n ${clst_KERNCACHE} ]]; then
 		GK_ARGS+=(--kerncache=/tmp/kerncache/${kname}-kerncache-${clst_version_stamp}.tar.bz2)
 	fi
-	if [ -e /var/tmp/${kname}.config ]
-	then
+	if [[ -e /var/tmp/${kname}.config ]]; then
 		GK_ARGS+=(--kernel-config=/var/tmp/${kname}.config)
 	fi
-
-	if [ -d "/tmp/initramfs_overlay/${initramfs_overlay}" ]
-	then
+	if [[ -d /tmp/initramfs_overlay/${initramfs_overlay} ]]; then
 		GK_ARGS+=(--initramfs-overlay=/tmp/initramfs_overlay/${initramfs_overlay})
 	fi
-	if [ -n "${clst_CCACHE}" ]
-	then
+	if [[ -n ${clst_CCACHE} ]]; then
 		GK_ARGS+=(--kernel-cc=/usr/lib/ccache/bin/gcc --utils-cc=/usr/lib/ccache/bin/gcc)
 	fi
-
-	if [ -n "${clst_linuxrc}" ]
-	then
+	if [[ -n ${clst_linuxrc} ]]; then
 		GK_ARGS+=(--linuxrc=/tmp/linuxrc)
 	fi
-
-	if [ -n "${clst_busybox_config}" ]
-	then
+	if [[ -n ${clst_busybox_config} ]]; then
 		GK_ARGS+=(--busybox-config=/tmp/busy-config)
 	fi
-
-	if [ "${clst_target}" == "netboot" ]
-	then
+	if [[ ${clst_target} == netboot ]]; then
 		GK_ARGS+=(--netboot)
 
-		if [ -n "${clst_merge_path}" ]
-		then
+		if [[ -n ${clst_merge_path} ]]; then
 			GK_ARGS+=(--initramfs-overlay="${clst_merge_path}")
 		fi
 	fi
-
-	if [ -n "${clst_VERBOSE}" ]
-	then
+	if [[ -n ${clst_VERBOSE} ]]; then
 		GK_ARGS+=(--loglevel=2)
 	fi
 
-	# Build with genkernel using the set options
-	# callback is put here to avoid escaping issues
-	if [ -n "${clst_VERBOSE}" ]
-	then
+	if [[ -n ${clst_VERBOSE} ]]; then
 		gk_callback_opts=(-vN)
 	else
 		gk_callback_opts=(-qN)
 	fi
-	if [ -n "${clst_KERNCACHE}" ]
-	then
+	if [[ -n ${clst_KERNCACHE} ]]; then
 		gk_callback_opts+=(-kb)
 	fi
-	if [ -n "${clst_FETCH}" ]
-	then
+	if [[ -n ${clst_FETCH} ]]; then
 		gk_callback_opts+=(-f)
 	fi
-	if [ "${kernel_merge}" != "" ]
-	then
+
+	if [[ -n ${kernel_merge} ]]; then
 		genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \
 			"${GK_ARGS[@]}" || exit 1
 	else

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     14ca450abdf91c9352ca4ff68e67b4e1ba8f0529
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:38:54 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=14ca450a

targets: Use full 'sys-kernel/genkernel' package name

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/pre-kmerge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 165dfd51..a92c436c 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -20,5 +20,5 @@ if [[ ${clst_hostarch} == hppa ]]; then
 	[[ $num64 > 1 ]] && die "Only one 64-bit kernel can be configured"
 fi
 
-run_merge --oneshot genkernel
+run_merge --oneshot sys-kernel/genkernel
 install -d /tmp/kerncache

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     9e8a99b1ac019f032d2e4e163c41ea88edd79803
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:40:34 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9e8a99b1

targets: Explicitly set RUN_DEFAULT_FUNCS="yes"

For documentation purposes.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/pre-kmerge.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index a92c436c..0dfc835e 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+RUN_DEFAULT_FUNCS="yes"
+
 source /tmp/chroot-functions.sh
 
 if [[ ${clst_hostarch} == hppa ]]; then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     9d167d45f011940b15c7bba09dd04fd2ca0235ae
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 23:10:36 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9d167d45

targets: Remove unnecessary unset PACKAGES

Dead code since 2008.

Fixes: b79d06a3 ("Remove temporary package listing code, ...")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 22340023..7222892e 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -270,7 +270,6 @@ run_merge() {
 show_debug() {
 	if [ -n "${clst_DEBUG}" ]
 	then
-		unset PACKAGES
 		echo "DEBUG:"
 		echo "Profile/target info:"
 		echo "Profile inheritance:"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6cac6a666a7ab8fec2dc966ed62b827f9f8b7d44
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 01:33:30 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6cac6a66

targets: Merge setup_gk_args() and genkernel_compile()

These both just do a bunch of argument concatenation and are not
separate functions in any meaningful way.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 27584d51..6a0137d7 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -4,7 +4,7 @@ source /tmp/chroot-functions.sh
 
 install -d /tmp/kerncache
 
-setup_gk_args() {
+genkernel_compile() {
 	# default genkernel args
 	GK_ARGS=(
 		"${kernel_gk_kernargs[@]}"
@@ -61,10 +61,6 @@ setup_gk_args() {
 	then
 		GK_ARGS+=(--loglevel=2)
 	fi
-}
-
-genkernel_compile(){
-	setup_gk_args
 
 	# Build with genkernel using the set options
 	# callback is put here to avoid escaping issues

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     d59b71937aad3de9a855562736a25de7f522cf4b
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:42:13 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d59b7193

targets: Inline run_default_funcs() function

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b531eb6a..307a9042 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -303,15 +303,6 @@ show_debug() {
 	fi
 }
 
-run_default_funcs() {
-	if [ "${RUN_DEFAULT_FUNCS}" != "no" ]
-	then
-		update_env_settings
-		setup_features
-		show_debug
-	fi
-}
-
 create_handbook_icon() {
 	# This function creates a local icon to the Gentoo Handbook
 	echo "[Desktop Entry]
@@ -330,5 +321,9 @@ readonly locales="
 C.UTF8 UTF-8
 "
 
-# We do this everywhere, so why not put it in this script
-run_default_funcs
+if [[ ${RUN_DEFAULT_FUNCS} != no ]]
+then
+	update_env_settings
+	setup_features
+	show_debug
+fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     07a8d208e1226d58efb8bc9416c030129dcae712
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 01:27:17 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=07a8d208

targets: Remove kernelpkgs.txt generation

Evidently this was to be consumed by the Gentoo Linux Installer, which
saw its last commit in 2008.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh          | 10 ----------
 targets/support/livecdfs-update.sh | 11 -----------
 2 files changed, 21 deletions(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c4136dec..27584d51 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -66,16 +66,6 @@ setup_gk_args() {
 genkernel_compile(){
 	setup_gk_args
 
-	# Build our list of kernel packages
-	case ${clst_livecd_type} in
-		gentoo-release-live*)
-			if [ -n "${kernel_merge}" ]
-			then
-				mkdir -p /usr/livecd
-				echo "${kernel_merge}" > /usr/livecd/kernelpkgs.txt
-			fi
-		;;
-	esac
 	# Build with genkernel using the set options
 	# callback is put here to avoid escaping issues
 	if [ -n "${clst_VERBOSE}" ]

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 47dbb5b3..b7ead552 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -296,19 +296,8 @@ case ${clst_livecd_type} in
 			ln -sf /usr/livecd/gconf /etc/gconf
 		fi
 
-		if [ -e /usr/livecd/kernelpkgs.txt ]
-		then
-			rm -f /usr/livecd/kernelpkgs.txt
-		fi
-
 		touch /etc/startx
 		;;
-	* )
-		if [ -e /usr/livecd/kernelpkgs.txt ]
-		then
-			rm -f /usr/livecd/kernelpkgs.txt
-		fi
-		;;
 esac
 
 # We want the first user to be used when auto-starting X

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     c2b6d25fb883cdcc36e05d44507326d7ae53f560
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 22:47:34 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 07:10:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c2b6d25f

targets: Move create_handbook_icon() to its use

And use <<- so we can indent the heredoc properly.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 14 --------------
 targets/support/livecdfs-update.sh  | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 307a9042..22340023 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -303,20 +303,6 @@ show_debug() {
 	fi
 }
 
-create_handbook_icon() {
-	# This function creates a local icon to the Gentoo Handbook
-	echo "[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Link
-URL=file:///mnt/cdrom/docs/handbook/html/index.html
-Terminal=false
-Name=Gentoo Linux Handbook
-GenericName=Gentoo Linux Handbook
-Comment=This is a link to the local copy of the Gentoo Linux Handbook.
-Icon=text-editor" > /usr/share/applications/gentoo-handbook.desktop
-}
-
 readonly locales="
 C.UTF8 UTF-8
 "

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 557d990b..47dbb5b3 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -243,6 +243,21 @@ case ${clst_livecd_type} in
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 
+		create_handbook_icon() {
+			cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
+				[Desktop Entry]
+				Encoding=UTF-8
+				Version=1.0
+				Type=Link
+				URL=file:///mnt/cdrom/docs/handbook/html/index.html
+				Terminal=false
+				Name=Gentoo Linux Handbook
+				GenericName=Gentoo Linux Handbook
+				Comment=This is a link to the local copy of the Gentoo Linux Handbook.
+				Icon=text-editor
+			EOF
+		}
+
 		# Create our Handbook icon
 		[ -e /docs/handbook/index.html ] && create_handbook_icon
 		[ -n "${clst_livecd_overlay}" ] && [ -e ${clst_livecd_overlay}/docs/handbook/index.html ] && create_handbook_icon

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     627fd3bc71cdd47086a300a3810a0a651d97824e
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 02:41:09 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=627fd3bc

targets: Remove unnecessary CONFIG_PROTECT assignment

CONFIG_PROTECT is set in run_merge, making this assignment and export
unnecessary.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 972feb99..5e284183 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -88,7 +88,6 @@ genkernel_compile() {
 }
 
 [ -n "${clst_ENVSCRIPT}" ] && source /tmp/envscript
-export CONFIG_PROTECT="-*"
 
 # Set the timezone for the kernel build
 rm /etc/localtime

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     9119f4ac49947825398f609627d03f4525aa004a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 23:03:02 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 23:26:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9119f4ac

targets: Drop warning about no cdtar

Most platforms use grub now and don't need a cdtar. Also use double
brackets while we're here.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index a82b69dc..ea18f736 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -4,12 +4,8 @@ source ${clst_shdir}/support/functions.sh
 
 # $1 is the destination root
 
-if [ -n "${clst_cdtar}" ]
-then
+if [[ -n ${clst_cdtar} ]]; then
 	extract_cdtar $1
-else
-	#While this seems a little crazy, it's entirely possible the bootloader is just shoved in isoroot overlay
-	echo "No cdtar and unable to auto generate boot loader files... good luck"
 fi
 
 extract_kernels $1/boot

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     7e1ea3ac0107c349333d1ec887917eb3627af7a4
Author:     Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Fri Oct 23 09:18:45 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 22:07:01 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7e1ea3ac

Build ISO with Joliet directory information

Previous syslinux based CDs had this information.
Necessary for direct kernel booting with virt-install --location.

Fixes: 0a27a7a39a "targets: Use GRUB for BIOS boot"
Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 9b1c7185..a5d5194e 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -191,12 +191,13 @@ case ${clst_hostarch} in
 	amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
+		extra_opts=("-joliet")
 		case ${clst_hostarch} in
-		sparc*) extra_opts="--sparc-boot" ;;
+		sparc*) extra_opts+=("--sparc-boot") ;;
 		esac
 
 		echo ">> Running grub-mkrescue to create iso image...."
-		grub-mkrescue ${extra_opts} -o "${1}" "${clst_target_path}"
+		grub-mkrescue "${extra_opts[*]}" -o "${1}" "${clst_target_path}"
 	;;
 esac
 exit  $?

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     898b9798e2f2e7e325f3b06b3e60d8251809351e
Author:     Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Fri Oct 23 09:18:44 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 22:03:23 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=898b9798

Update requirements for amd64/x86 ISO creation

xorriso uses mkisofs to create the ISO.

Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index ac97ef56..9b1c7185 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -18,9 +18,13 @@ case ${clst_hostarch} in
                 cdmaker="grub-mkrescue"
                 cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
                 ;;
-	ia64)
+	amd64|ia64|x86)
 		cdmaker="grub-mkrescue"
-		cdmakerpkg="sys-fs/mtools, dev-libs/libisoburn, and sys-boot/grub:2"
+		# grub-mkrescue requires:
+		#  xorriso from libisoburn
+		#  mkisofs from cdrtools
+		#  mformat from mtools
+		cdmakerpkg="sys-fs/mtools, dev-libs/libisoburn, sys-boot/grub:2, and virtual/cdrtools"
 		;;
 	*)
 		cdmaker="mkisofs"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     eb5509b929cf162ecb1bea35f7aa4e3d150edf6d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  2 16:47:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Nov  2 16:56:08 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=eb5509b9

targets: Expand extra_opts into separate words

I introduced this mistaken when reworking the patch referenced below.

Fixes: 7e1ea3ac ("Build ISO with Joliet directory information")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index a5d5194e..70684f78 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -197,7 +197,7 @@ case ${clst_hostarch} in
 		esac
 
 		echo ">> Running grub-mkrescue to create iso image...."
-		grub-mkrescue "${extra_opts[*]}" -o "${1}" "${clst_target_path}"
+		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
 esac
 exit  $?

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     ee1fb86d76f47a38e0c3991f897b4c1896637557
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 19 00:04:23 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Dec 19 02:56:52 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ee1fb86d

targets: Remove EBEEP_IGNORE / EPAUSE_IGNORE

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 89a313f7..d125756f 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -260,8 +260,6 @@ run_merge() {
 
 	export EMERGE_WARNING_DELAY=0
 	export CLEAN_DELAY=0
-	export EBEEP_IGNORE=0
-	export EPAUSE_IGNORE=0
 	[[ $CONFIG_PROTECT != "-*"* ]] && export CONFIG_PROTECT="-*"
 
 	if [ -n "${clst_VERBOSE}" ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     42332a642def9a8d454246da68955172442e7aa5
Author:     Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Thu Feb  4 11:07:21 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 21 02:05:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=42332a64

targets: Use the correct distcc libdir

Since distcc-3.3 (and bug 651030) distcc symlinks have been installed to
/usr/lib/distcc/bin/ regardless of get_libdir.

Signed-off-by: Daniel Cordero <catalyst <AT> 0xdc.io>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/chroot-functions.sh | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 88465c31..d8472d46 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -83,11 +83,10 @@ setup_features() {
 		# This sets up automatic cross-distcc-fu according to
 		# https://wiki.gentoo.org/wiki/Distcc/Cross-Compiling
 		CHOST=$(portageq envvar CHOST)
-		LIBDIR=$(get_libdir)
-		cd /usr/${LIBDIR}/distcc/bin
+		cd /usr/lib/distcc/bin
 		rm cc gcc g++ c++ 2>/dev/null
-		echo -e '#!/bin/bash\nexec /usr/'${LIBDIR}'/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
-		chmod a+x /usr/${LIBDIR}/distcc/bin/${CHOST}-wrapper
+		echo -e '#!/bin/bash\nexec /usr/lib/distcc/bin/'${CHOST}'-g${0:$[-2]} "$@"' > ${CHOST}-wrapper
+		chmod a+x /usr/lib/distcc/bin/${CHOST}-wrapper
 		for i in cc gcc g++ c++; do ln -s ${CHOST}-wrapper ${i}; done
 	fi
 
@@ -171,13 +170,12 @@ setup_gcc(){
 }
 
 cleanup_distcc() {
-	LIBDIR=$(get_libdir)
-	rm -rf /etc/distcc/hosts
+	rm -f /etc/distcc/hosts
 	for i in cc gcc c++ g++; do
-		rm -f /usr/${LIBDIR}/distcc/bin/${i}
-		ln -s /usr/bin/distcc /usr/${LIBDIR}/distcc/bin/${i}
+		rm -f /usr/lib/distcc/bin/${i}
+		ln -s /usr/bin/distcc /usr/lib/distcc/bin/${i}
 	done
-	rm -f /usr/${LIBDIR}/distcc/bin/*-wrapper
+	rm -f /usr/lib/distcc/bin/*-wrapper
 }
 
 cleanup_icecream() {

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     7183c82189dcfdaf514ce54f3e688fe1d05c4402
Author:     Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Mon Jul 19 03:00:55 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 03:03:10 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7183c821

targets: Pass gk_callback_opts as a string instead of array

Fixes: e5855bef ("targets: Use arrays rather than string concatenation")
Signed-off-by: Nic Boet <nic <AT> boet.cc>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/kmerge.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index fb67aba6..20b471f1 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -60,7 +60,8 @@ genkernel_compile() {
 	fi
 
 	if [[ -n ${kernel_merge} ]]; then
-		genkernel --callback="emerge ${gk_callback_opts[@]} ${kernel_merge}" \
+		gk_callback=${gk_callback_opts[@]}
+		genkernel --callback="emerge ${gk_callback} ${kernel_merge}" \
 			"${GK_ARGS[@]}" || exit 1
 	else
 		genkernel "${GK_ARGS[@]}" || exit 1

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     436daf985ada2e38d255cd57aad4bcd460adb30f
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 23:51:13 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 00:36:43 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=436daf98

targets: Use app-cdr/cdrtools instead of virtual

virtual no longer exists as of gentoo.git commit 45233a05d40
("virtual/cdrtools: Remove").

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 838962fe..9ff227a9 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -24,11 +24,11 @@ case ${clst_hostarch} in
 		#  xorriso from libisoburn
 		#  mkisofs from cdrtools
 		#  mformat from mtools
-		cdmakerpkg="sys-fs/mtools, dev-libs/libisoburn, sys-boot/grub:2, and virtual/cdrtools"
+		cdmakerpkg="sys-fs/mtools, dev-libs/libisoburn, sys-boot/grub:2, and app-cdr/cdrtools"
 		;;
 	*)
 		cdmaker="mkisofs"
-		cdmakerpkg="virtual/cdrtools"
+		cdmakerpkg="app-cdr/cdrtools"
 		;;
 esac
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     e0b9b007b563188cca5f5317f780bb5d4bbb17d1
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 23:51:12 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 00:36:42 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e0b9b007

targets: Add arm64 livecd support

Closes: https://bugs.gentoo.org/785769
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 targets/support/create-iso.sh       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index ea18f736..4cfa61eb 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -87,7 +87,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|ia64|ppc*|powerpc*|sparc*|x86)
+	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 9b2cbb60..838962fe 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -18,7 +18,7 @@ case ${clst_hostarch} in
                 cdmaker="grub-mkrescue"
                 cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
                 ;;
-	amd64|ia64|x86)
+	amd64|arm64|ia64|x86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn
@@ -52,6 +52,9 @@ then
 				arm)
 					clst_iso_volume_id="Gentoo Linux - ARM"
 				;;
+				arm64)
+					clst_iso_volume_id="Gentoo Linux - ARM64"
+				;;
 				hppa)
 					clst_iso_volume_id="Gentoo Linux - HPPA"
 				;;
@@ -188,7 +191,7 @@ case ${clst_hostarch} in
 		# o=	output image (burnable to CD; readable by fdisk)
 		/usr/bin/sgibootcd c=${cfg} o=${clst_iso}
 	;;
-	amd64|ia64|ppc*|powerpc*|sparc*|x86)
+	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
 		extra_opts=("-joliet")

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     6976c5fe167b7949c8a33edace8cd93fd87e8dcd
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 29 01:07:33 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul 29 01:07:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6976c5fe

targets: Remove dead custom_kopts variable

It looks like this has been dead since 2005.

Closes: https://bugs.gentoo.org/804591
Fixes: 1fcca247 ("Removed these as they are moved to the appropriate target directories")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 4cfa61eb..a998a420 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -31,7 +31,7 @@ case ${clst_fstype} in
 esac
 
 
-default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} ${custom_kopts} cdroot)
+default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} cdroot)
 
 case ${clst_hostarch} in
 	alpha)
@@ -99,7 +99,6 @@ case ${clst_hostarch} in
 		for x in ${clst_boot_kernel}
 		do
 			eval "kernel_console=\$clst_boot_kernel_${x}_console"
-			eval custom_kopts=\$${x}_kernelopts
 
 			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
 			echo "	linux ${kern_subdir}/${x} ${default_append_line[@]}" >> ${iacfg}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     0b56dbe4d36c88b0b051d24451e15cd6b64c819d
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 09:11:42 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 09:17:01 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0b56dbe4

livecd: Use ISO level 3

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 9ff227a9..45ef1696 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -194,7 +194,7 @@ case ${clst_hostarch} in
 	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
-		extra_opts=("-joliet")
+		extra_opts=("-joliet" "-iso-level 3")
 		case ${clst_hostarch} in
 		sparc*) extra_opts+=("--sparc-boot") ;;
 		esac

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     05b1f53a03e6e4ca9373cbd280c4e22ed234ac4f
Author:     Daniel Cordero <catalyst <AT> 0xdc <DOT> io>
AuthorDate: Tue Apr 19 17:40:15 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 23:24:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=05b1f53a

create-iso.sh: split iso-level arguments

When enclosed in quotes and expanded with "${variable[@]}", the word is expanded
to be a single argument, rather than two separate arguments.

i.e. argv[2] = "-iso-level 3"
instead of
  argv[2] = "-iso-level"
  argv[3] = "3"

This lead to the failure:
  xorriso : FAILURE : -as mkisofs: Unrecognized option '-iso-level 3'
  xorriso : aborting : -abort_on 'FAILURE' encountered 'FAILURE'
  grub-mkrescue: error: `xorriso` invocation failed

Fixes: 0b56dbe4 ("livecd: Use ISO level 3")
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 45ef1696..9991b930 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -194,7 +194,7 @@ case ${clst_hostarch} in
 	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
-		extra_opts=("-joliet" "-iso-level 3")
+		extra_opts=("-joliet" "-iso-level" "3")
 		case ${clst_hostarch} in
 		sparc*) extra_opts+=("--sparc-boot") ;;
 		esac

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     97bbf021ba57fa2fcf0e3914d98cff10151a6098
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 02:54:30 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:41:05 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=97bbf021

targets: Drop /etc/asound.state creation

alsa creates this file at runtime at /var/lib/alsa/asound.state in
modern times.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index e750e785..251a6887 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -125,9 +125,6 @@ then
 		http://www.linux-usb.org/usb.ids
 fi
 
-# touch /etc/asound.state
-touch /etc/asound.state
-
 # Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
 	gentoo-release-universal)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     4859c15694763ce26018c7cd8e00eda5e38bdd13
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 02:16:03 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:41:05 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4859c156

targets: Remove openglify usage

This script was removed from livecd-tools in commit 8e2a9c0 ("remove
openglify") in 2011.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b7548347..64a9e4b2 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -131,9 +131,6 @@ then
 		http://www.linux-usb.org/usb.ids
 fi
 
-# Setup opengl in /etc (if configured)
-[ -x /usr/sbin/openglify ] && /usr/sbin/openglify
-
 # Setup configured display manager
 if [ -n "${clst_livecd_xdm}" ]
 then

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     ca8ec7382a0b8c06b9bd3b69e5d7a791e0fa8915
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 02:20:21 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:41:05 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ca8ec738

targets: Fix enabling PermitRootLogin

The default changed to "prohibit-password" many moons ago, so our ISOs
would not have allowed root logins if not for net-misc/openssh's
IUSE=livecd, which handles this in the ebuild.

Let's go ahead and fix it, so that we can consider removing openssh's
livecd USE flag which would allow us to avoid rebuilding the package for
the ISO.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b7ead552..3f47012b 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -7,7 +7,8 @@ source /tmp/chroot-functions.sh
 # Allow root logins to our CD by default
 if [ -e /etc/ssh/sshd_config ]
 then
-	sed -i 's:^#PermitRootLogin\ yes:PermitRootLogin\ yes:' \
+	sed -i \
+		-e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
 		/etc/ssh/sshd_config
 fi
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     27c61efa500e2d72a1aef49d96bc91860ca33c49
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 23:52:19 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 21:19:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=27c61efa

targets: Fix some indentation

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 9991b930..8eada6a7 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -11,13 +11,13 @@ case ${clst_hostarch} in
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
 	mips)
-   		cdmaker="sgibootcd"
+		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
-        ppc*|powerpc*|sparc*)
-                cdmaker="grub-mkrescue"
-                cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
-                ;;
+	ppc*|powerpc*|sparc*)
+		cdmaker="grub-mkrescue"
+		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
+		;;
 	amd64|arm64|ia64|x86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     2324a630a7c650187edd0ce7b1343a6f3e40423d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 07:37:00 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 21:19:03 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2324a630

targets: fix comparison operator

'<' and '>' work lexicographically in bash.

Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/pre-kmerge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 0dfc835e..ed825f5f 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -18,8 +18,8 @@ if [[ ${clst_hostarch} == hppa ]]; then
 				;;
 		esac
 	done
-	[[ $num32 > 1 ]] && die "Only one 32-bit kernel can be configured"
-	[[ $num64 > 1 ]] && die "Only one 64-bit kernel can be configured"
+	[[ $num32 -gt 1 ]] && die "Only one 32-bit kernel can be configured"
+	[[ $num64 -gt 1 ]] && die "Only one 64-bit kernel can be configured"
 fi
 
 run_merge --oneshot sys-kernel/genkernel

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     567981dca789e70eaf53b5bc5240750da56fe04a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 23:02:28 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 23:02:28 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=567981dc

Run grub-mkrescue also for i?86 subarches

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8eada6a7..8a603944 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -18,7 +18,7 @@ case ${clst_hostarch} in
 		cdmaker="grub-mkrescue"
 		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
 		;;
-	amd64|arm64|ia64|x86)
+	amd64|arm64|ia64|x86|i?86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     33eedbd166f355069a4c8ac958f78fdc01c3a6d0
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:20:40 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 11:20:40 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=33eedbd1

More i?86 fixes for x86

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 targets/support/create-iso.sh       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index deff5609..065f2bb5 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -103,7 +103,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
+	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86|i?86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8a603944..74c24a1d 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -191,7 +191,7 @@ case ${clst_hostarch} in
 		# o=	output image (burnable to CD; readable by fdisk)
 		/usr/bin/sgibootcd c=${cfg} o=${clst_iso}
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
+	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86|i?86)
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     1c67748297c23157c693cfee5f869a0deb9f6802
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 20:22:02 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jan  2 20:22:02 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1c677482

targets/support/livecdfs-update.sh: set hostname= rather than HOSTNAME=

Apparently the use of HOSTNAME in /etc/conf.d/hostname has been
deprecated in favor of hostname for a while.  Support for that was
completely removed recently.

https://github.com/OpenRC/openrc/commit/d2b31440708bd0cb70e5317e05b8ae80e4866269

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 251a6887..dafe4c3a 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -17,7 +17,7 @@ rm -rf /etc/localtime
 cp /usr/share/zoneinfo/UTC /etc/localtime
 
 # Setup the hostname
-echo 'HOSTNAME="livecd"' > /etc/conf.d/hostname
+echo 'hostname="livecd"' > /etc/conf.d/hostname
 echo "127.0.0.1 livecd.gentoo livecd localhost" > /etc/hosts
 
 # Since we're an official Gentoo release, we do things the official Gentoo way.

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     1dfba7ee041d6b1e6a8a7af58f28728a8912a1ab
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:37:43 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1dfba7ee

livecdfs-update.sh: remove code obsoleted by sys-apps/hwids package

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 1be4baea..a2ac26c8 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -101,30 +101,6 @@ alias ll='ls -l'
 alias grep='grep --color=auto'
 EOF
 
-# Make sure we have the latest pci,usb and hotplug ids.  Older versions of
-# pciutils and usbutils used /sbin, where newer versions use /usr/sbin.
-[ -x /sbin/update-pciids ] && /sbin/update-pciids
-[ -x /sbin/update-usbids ] && /sbin/update-usbids
-[ -x /usr/sbin/update-pciids ] && /usr/sbin/update-pciids
-[ -x /usr/sbin/update-usbids ] && /usr/sbin/update-usbids
-if [ -d /usr/share/hwdata ]
-then
-	# If we have uncompressed pci and usb ids files, symlink them.
-	[ -f /usr/share/misc/pci.ids ] && [ -f /usr/share/hwdata/pci.ids ] && \
-		rm -f /usr/share/hwdata/pci.ids && ln -s /usr/share/misc/pci.ids \
-		/usr/share/hwdata/pci.ids
-	[ -f /usr/share/misc/usb.ids ] && [ -f /usr/share/hwdata/usb.ids ] && \
-		rm -f /usr/share/hwdata/usb.ids && ln -s /usr/share/misc/usb.ids \
-		/usr/share/hwdata/usb.ids
-	# If we have compressed pci and usb files, we download our own copies.
-	[ -f /usr/share/misc/pci.ids.gz ] && [ -f /usr/share/hwdata/pci.ids ] && \
-		rm -f /usr/share/hwdata/pci.ids && wget -O /usr/share/hwdata/pci.ids \
-		http://pciids.sourceforge.net/v2.2/pci.ids
-	[ -f /usr/share/misc/usb.ids.gz ] && [ -f /usr/share/hwdata/usb.ids ] && \
-		rm -f /usr/share/hwdata/usb.ids && wget -O /usr/share/hwdata/usb.ids \
-		http://www.linux-usb.org/usb.ids
-fi
-
 # Tweak the MOTD for Gentoo releases
 case ${clst_livecd_type} in
 	gentoo-release-universal)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     fd528f28ff1157ced65edb2e821cd16aa68c1802
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:48:27 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fd528f28

livecdfs-update.sh: remove confusing "reduce tmpfs usage" hack

I don't believe this provides any real value now, and it makes the
livecd layout confusing.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index ca8997f7..16e201d5 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -113,13 +113,6 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l
 # Post configuration
 case ${clst_livecd_type} in
 	gentoo-release-live*)
-		# This is my hack to reduce tmpfs usage
-		mkdir -p /usr/livecd
-		cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
-		rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
-		mv -f /var/db /usr/livecd
-		ln -sf /usr/livecd/db /var/db
-
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     79ee199b34761ca2e2204ed687d7b245552d8cf6
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 19:11:28 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:38 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=79ee199b

livecdfs-update: remove old evms code

Mostly obsoleted by LVM almost 20 years ago

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index d4548020..05714c52 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -147,9 +147,4 @@ case ${clst_livecd_type} in
 		;;
 esac
 
-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
-fi
-
 env-update

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     f478e8f34af1a45c706f18a34df7f3efa208d581
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 20:01:32 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:38 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f478e8f3

bootloader-setup.sh: remove obsolete cmdline args

These haven't been needed since kernel 2.4 days, as far as I know.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 065f2bb5..32d86028 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -53,7 +53,7 @@ memtest_grub() {
   fi
 }
 
-default_append_line=(root=/dev/ram0 init=/linuxrc ${cmdline_opts[@]} cdroot)
+default_append_line=(${cmdline_opts[@]} cdroot)
 
 case ${clst_hostarch} in
 	alpha)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     0a8ca2598868cce8f3289a5f517e4d6f10234d9f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:39:46 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0a8ca259

livecdfs-update.sh: remove old devfsd code

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index a2ac26c8..9e0fd6cc 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -88,9 +88,6 @@ cat <<EOF > ${clst_make_conf}
 EOF
 cat ${clst_make_conf}.old >> ${clst_make_conf}
 
-# devfs tweaks
-[ -e /etc/devfsd.conf ] && sed -i '/dev-state/ s:^:#:' /etc/devfsd.conf
-
 # Add some helpful aliases
 cat <<EOF >> /etc/profile
 alias cp='cp -i'

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     0c26863c06762bb954d283849777dcde1dc0f616
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:54:21 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0c26863c

livecdfs-update.sh: replace local handbook with wiki handbook

Code to look for a local html handbook is obsolete.  Link to the wiki
handbook instead, and install the entry unconditionally for gentoo
targets.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 16e201d5..bf19ccf5 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -112,28 +112,22 @@ rm -f /etc/generic.motd.txt /etc/universal.motd.txt /etc/minimal.motd.txt /etc/l
 
 # Post configuration
 case ${clst_livecd_type} in
-	gentoo-release-live*)
+	gentoo-release-*)
 		# Clear out lastlog
 		rm -f /var/log/lastlog && touch /var/log/lastlog
 
-		create_handbook_icon() {
-			cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
-				[Desktop Entry]
-				Encoding=UTF-8
-				Version=1.0
-				Type=Link
-				URL=file:///mnt/cdrom/docs/handbook/html/index.html
-				Terminal=false
-				Name=Gentoo Linux Handbook
-				GenericName=Gentoo Linux Handbook
-				Comment=This is a link to the local copy of the Gentoo Linux Handbook.
-				Icon=text-editor
-			EOF
-		}
-
-		# Create our Handbook icon
-		[ -e /docs/handbook/index.html ] && create_handbook_icon
-		[ -n "${clst_livecd_overlay}" ] && [ -e ${clst_livecd_overlay}/docs/handbook/index.html ] && create_handbook_icon
+		cat <<-EOF > /usr/share/applications/gentoo-handbook.desktop
+			[Desktop Entry]
+			Encoding=UTF-8
+			Version=1.0
+			Type=Link
+			URL=https://wiki.gentoo.org/wiki/Handbook:Main_Page
+			Terminal=false
+			Name=Gentoo Linux Handbook
+			GenericName=Gentoo Linux Handbook
+			Comment=This is a link to Gentoo Linux Handbook.
+			Icon=text-editor
+		EOF
 
 		# Copy our icons into place and build home directories
 		if [ -n "${clst_livecd_users}" ]

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     f351f8e56ce00c8c36646b2ade13c4f2c9b96751
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:40:38 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:37 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f351f8e5

livecdfs-update.sh: remove net.eth[1234] symlinks

I don't think these are providing any value to anyone, since interfaces
don't get eth* names by default and very few livecd users will be using
netifrc anyway.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/livecdfs-update.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index 9e0fd6cc..ca8997f7 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -60,12 +60,6 @@ then
 	sed -i '/NOPASSWD: ALL/ s/^# //' /etc/sudoers
 fi
 
-# Setup links for ethernet devices
-cd /etc/init.d
-for i in {1..4}; do
-	ln -sf net.lo net.eth${i}
-done
-
 # Add this for hwsetup/mkx86config
 mkdir -p /etc/sysconfig
 

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     c21f53e42bf007ad074b0c6b23bfd85564832d46
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 13:26:08 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 31 13:27:38 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c21f53e4

remove obsolete root=/dev/ram0 init=/linuxrc from a few more places

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 8 ++++----
 targets/support/netboot-final.sh    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 32d86028..d6d5f96e 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -64,8 +64,8 @@ case ${clst_hostarch} in
 		for x in ${clst_boot_kernel}
 		do
 			echo -n "${bctr}:/boot/${x} " >> ${acfg}
-			echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg}
-			echo "init=/linuxrc ${cmdline_opts[@]} cdroot" >> ${acfg}
+			echo -n "initrd=/boot/${x}.igz " >> ${acfg}
+			echo "${cmdline_opts[@]} cdroot" >> ${acfg}
 			((bctr=${bctr}+1))
 		done
 		# Pass 2 is for serial
@@ -73,8 +73,8 @@ case ${clst_hostarch} in
 		for x in ${clst_boot_kernel}
 		do
 			echo -n "${bctr}:/boot/${x} " >> ${acfg}
-			echo -n "initrd=/boot/${x}.igz root=/dev/ram0 " >> ${acfg}
-			echo "init=/linuxrc ${cmdline_opts[@]} cdroot" >> ${acfg}
+			echo -n "initrd=/boot/${x}.igz " >> ${acfg}
+			echo "${cmdline_opts[@]} cdroot" >> ${acfg}
 			((bctr=${bctr}+1))
 		done
 	;;

diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh
index 7a26e0f4..fc0de880 100755
--- a/targets/support/netboot-final.sh
+++ b/targets/support/netboot-final.sh
@@ -31,7 +31,7 @@ case ${clst_hostarch} in
 			-s ${clst_target_path}/${kname}-hppa.lif \
 			-f /dev/null \
 			-b /usr/share/palo/iplboot \
-			-c "0/vmlinux initrd=0/ramdisk root=/dev/ram0" \
+			-c "0/vmlinux initrd=0/ramdisk" \
 			|| exit 1
 
 		;;

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     7247751e4c5ad19786c40a7ed1c87ad0b836026e
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Aug 23 00:39:03 2023 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 20:02:41 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7247751e

Compile external modules with dist-kernel

If boot/kernel/${kernel}/packages is defined, force build external module packages for dist-kernels.

Also don't unmerge kernel after merging as it may needed for building process, just deselect. Later it will be unmerged by depclean process.

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/kmerge.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c5beddc9..7114ff91 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -152,6 +152,11 @@ if [[ -n ${clst_KERNCACHE} ]]; then
 fi
 
 if [[ ${distkernel} = "yes" ]] ; then
+  # Build external kernel modules
+  if [[ -n ${kernel_merge} ]]; then
+    run_merge ${kernel_merge}
+  fi
+
   # Kernel already built, let's run dracut to make initramfs
   distkernel_source_path=$(equery -Cq f ${ksource} | grep "/usr/src/linux-" -m1)
   distkernel_image_path=$(distkmerge_get_image_path)
@@ -201,6 +206,6 @@ if [[ -n ${clst_KERNCACHE} && ! ${cached_kernel_found} ]]; then
 fi
 
 if [[ ! ${cached_kernel_found} ]]; then
-	run_merge -C "${ksource}"
+	run_merge --deselect "${ksource}"
 	rm /usr/src/linux
 fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     b8500a65023dd4e278af2400ebb94e4768473130
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 15:32:28 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 15:36:07 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b8500a65

kmerge.sh: don't remove the /usr/src/linux symlink

Removing this symlink causes failures for any specs building more than
one kernel, since we no longer do a full unmerge/remerge of kernel
sources between kernel builds.

We probably need to set USE=symlink for the kernel sources so that specs
building 2 kernels from different sets of sources do not fail.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/kmerge.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index 7114ff91..41fac810 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -207,5 +207,6 @@ fi
 
 if [[ ! ${cached_kernel_found} ]]; then
 	run_merge --deselect "${ksource}"
-	rm /usr/src/linux
+	# This was breaking multi-kernel iso builds, probably not needed
+	# rm /usr/src/linux
 fi

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     04c70a9df505718c7e97ca1484f7c03270e6824c
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Thu May  2 17:56:27 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu May  2 17:58:38 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=04c70a9d

create-iso.sh: restore ISO volume ID

When we switched to grub-mkrescue for the ISO generation, we lost the
volume ID.  Luckly grub-mkresce takes unrecognized parameters and passes
them to xorriso so we can just add the xorriso -volid parameter here.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 74c24a1d..0468f965 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -200,7 +200,7 @@ case ${clst_hostarch} in
 		esac
 
 		echo ">> Running grub-mkrescue to create iso image...."
-		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
+		grub-mkrescue -volid "${clst_iso_volume_id}" "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
 esac
 exit  $?

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     eff4b31ba42d96ab2cb29195455c63b3321c0835
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 14:52:02 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 13 14:52:02 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=eff4b31b

bootloader_setup.sh: don't assume LABEL=ISOIMAGE

Catalyst now sets a proper volume ID via grub-mkrescue so assuming
ISOIMAGE here is no longer correct.  The volume ID will still need
to be standard-compliant without spaces.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 455a4f07..9196ea14 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -54,7 +54,7 @@ memtest_grub() {
 }
 
 default_append_line=(${cmdline_opts[@]} cdroot)
-default_dracut_append_line=(root=live:CDLABEL=ISOIMAGE rd.live.dir=/ rd.live.squashimg=image.squashfs)
+default_dracut_append_line=(root=live:CDLABEL=${clst_iso_volume_id} rd.live.dir=/ rd.live.squashimg=image.squashfs)
 
 case ${clst_hostarch} in
 	alpha)
@@ -121,7 +121,7 @@ case ${clst_hostarch} in
 			echo "menuentry 'Boot LiveCD (kernel: ${x})' --class gnu-linux --class os {"  >> ${iacfg}
 			if [ ${distkernel} = "yes" ]
 			then
-				echo "	search --no-floppy --set=root -l 'ISOIMAGE'" >> ${iacfg}
+				echo "	search --no-floppy --set=root -l ${clst_iso_volume_id}" >> ${iacfg}
 				echo "	linux ${kern_subdir}/${x} ${default_dracut_append_line[@]}" >> ${iacfg}
 			else
 				echo "	linux ${kern_subdir}/${x} ${default_append_line[@]}" >> ${iacfg}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     6e3cb65fdfedc2bdd2c1ddf4cd60fcdc38168760
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 15:06:42 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 13 15:06:42 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6e3cb65f

bootloader_setup.sh: fix LABEL for cached entry as well

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 9196ea14..2f2f97a5 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -132,7 +132,7 @@ case ${clst_hostarch} in
 			echo "menuentry 'Boot LiveCD (kernel: ${x}) (cached)' --class gnu-linux --class os {"  >> ${iacfg}
 			if [ ${distkernel} = "yes" ]
 			then
-				echo "	search --no-floppy --set=root -l 'ISOIMAGE'" >> ${iacfg}
+				echo "	search --no-floppy --set=root -l ${clst_iso_volume_id}" >> ${iacfg}
 				echo "	linux ${kern_subdir}/${x} ${default_dracut_append_line[@]} rd.live.ram=1" >> ${iacfg}
 			else
 				echo "	linux ${kern_subdir}/${x} ${default_append_line[@]} docache" >> ${iacfg}

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     57b03421626a9cdd159075b40974cc3b401e3742
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 15:24:24 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 13 15:24:24 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=57b03421

bootloader_setup.sh: pass cdroot for dist-kernels as well

This is actually used in livecd-tools later, independent of gk vs dracut

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 2f2f97a5..b82e092c 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -54,7 +54,7 @@ memtest_grub() {
 }
 
 default_append_line=(${cmdline_opts[@]} cdroot)
-default_dracut_append_line=(root=live:CDLABEL=${clst_iso_volume_id} rd.live.dir=/ rd.live.squashimg=image.squashfs)
+default_dracut_append_line=(root=live:CDLABEL=${clst_iso_volume_id} rd.live.dir=/ rd.live.squashimg=image.squashfs cdroot)
 
 case ${clst_hostarch} in
 	alpha)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     e41fa2eba386fd39942f5235438d550f5ddef4dc
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 13:25:20 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue May 14 13:25:20 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e41fa2eb

bootloader-setup.sh: apply livecd/bootargs to dist-kernel as well

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/bootloader-setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index b82e092c..34d95dc9 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -54,7 +54,7 @@ memtest_grub() {
 }
 
 default_append_line=(${cmdline_opts[@]} cdroot)
-default_dracut_append_line=(root=live:CDLABEL=${clst_iso_volume_id} rd.live.dir=/ rd.live.squashimg=image.squashfs cdroot)
+default_dracut_append_line=(${clst_livecd_bootargs} root=live:CDLABEL=${clst_iso_volume_id} rd.live.dir=/ rd.live.squashimg=image.squashfs cdroot)
 
 case ${clst_hostarch} in
 	alpha)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Ben Kohler]

commit:     5f91f18939b076949bffbfbacd921efc07109c1c
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 11:05:55 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 11:07:23 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5f91f189

create-iso.sh: add flag for BIOS boot quirk

Some BIOS implementations (or legacy CSM/compat on UEFI) may ignore a
boot device if it doesn't have one MBR partition marked with the boot
flag.  This new argument to xorriso will add an extra dummy partition
with that flag.  It's been reported to help at least one user boot.

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 targets/support/create-iso.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 0468f965..aa597a59 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -200,7 +200,7 @@ case ${clst_hostarch} in
 		esac
 
 		echo ">> Running grub-mkrescue to create iso image...."
-		grub-mkrescue -volid "${clst_iso_volume_id}" "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
+		grub-mkrescue --mbr-force-bootable -volid "${clst_iso_volume_id}" "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
 esac
 exit  $?

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     33fc7eb69375b28f20eb254c5a7aee1cee122b69
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 14:41:59 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:30:40 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=33fc7eb6

Support scripts for bootloader installation and configuration

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/qcow2-grub-install.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/targets/support/qcow2-grub-install.sh b/targets/support/qcow2-grub-install.sh
new file mode 100755
index 00000000..850eb72a
--- /dev/null
+++ b/targets/support/qcow2-grub-install.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+echo "Installing grub with target x86_64-efi"
+grub-install --no-floppy --efi-directory=/boot --removable --skip-fs-probe --no-nvram --no-bootsector --target=x86_64-efi
+
+echo "Creating grub configuration"
+grub-mkconfig -o /boot/grub/grub.cfg

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     f59604b8509bff8469bdbbc5389b3cb5b43e7fcd
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 14:42:29 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:30:46 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f59604b8

Support scripts for diskimage configuration

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/diskimagefs-update.sh | 63 +++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/targets/support/diskimagefs-update.sh b/targets/support/diskimagefs-update.sh
new file mode 100755
index 00000000..45d870a5
--- /dev/null
+++ b/targets/support/diskimagefs-update.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+source /tmp/chroot-functions.sh
+
+if [[ $(readlink /etc/portage/make.profile) == *systemd* ]] ; then
+
+# We are using systemd.
+
+# Types of bootable disk images planned for (diskimage/type):
+# cloud-init - an image that starts cloud-init for configuration and then can be
+#              used out of the box
+# console    - an image that has an empty root password and allows passwordless
+#              login on the console only
+# ssh        - an image that populates /root/.ssh/authorized_keys and starts dhcp
+#              as well as sshd; obviously not fit for public distribution
+# generic    - an image with no means of logging in... needs postprocessing
+#              no services are started
+
+echo "Generating /etc/locale.gen"
+cat > /etc/locale.gen <<END
+en_US ISO-8859-1
+en_US.UTF-8 UTF-8
+END
+
+echo "Running systemctl preset-all"
+systemctl preset-all || die "Running systemctl preset-all failed"
+
+echo "Setting locale"
+echo 'LANG="en_US.UTF-8"' > /etc/locale.conf || die "Failed to set locale"
+env-update || die "Failed to run env-update"
+
+echo "Setting keymap"
+echo "KEYMAP=us" > /etc/vconsole.conf || die "Failed to set keymap"
+
+echo "Disk image type is ${clst_diskimage_type}"
+case ${clst_diskimage_type} in
+	generic)
+		echo "Setting up generic image (warning, not very useful on its own)"
+		echo "Running systemd-firstboot"
+		systemd-firstboot --timezone=UTC || die "Failed running systemd-firstboot"
+		;;
+	console)
+		echo "Setting up console log-in image. Please set the root password ASAP."
+		echo "Removing root password"
+		passwd -d root || die "Failed removing root password"
+		echo "Running systemd-firstboot"
+		systemd-firstboot --timezone=UTC || die "Failed running systemd-firstboot"
+		;;
+	*)
+		die "As yet unsupported image type"
+		;;
+esac
+
+else
+
+# We are using OpenRC.
+
+die "OpenRC is as yet unsupported."
+
+fi
+
+# all done
+# (we can't install the boot loader here because nothing is mounted)

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     8479d978c238c9adc1258915876d51ef15aa1777
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 17:06:10 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:31:01 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=8479d978

Default to C.UTF-8 same as the ISO

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/diskimagefs-update.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/targets/support/diskimagefs-update.sh b/targets/support/diskimagefs-update.sh
index 79277618..f7da3f0f 100755
--- a/targets/support/diskimagefs-update.sh
+++ b/targets/support/diskimagefs-update.sh
@@ -36,15 +36,16 @@ configure_sshd() {
 
 echo "Generating /etc/locale.gen"
 cat > /etc/locale.gen <<END
-en_US ISO-8859-1
-en_US.UTF-8 UTF-8
+# en_US ISO-8859-1
+# en_US.UTF-8 UTF-8
+C.UTF-8 UTF-8
 END
 
 echo "Running systemctl preset-all"
 systemctl preset-all || die "Running systemctl preset-all failed"
 
 echo "Setting locale"
-echo 'LANG="en_US.UTF-8"' > /etc/locale.conf || die "Failed to set locale"
+echo 'LANG="C.UTF-8"' > /etc/locale.conf || die "Failed to set locale"
 env-update || die "Failed to run env-update"
 
 echo "Setting keymap"

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     48a56d53fa7b00ac319a25315bd309914f6d8da4
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 14:42:49 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:30:49 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=48a56d53

Script to create a bootable qcow2 image

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/create-qcow2.sh | 188 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 188 insertions(+)

diff --git a/targets/support/create-qcow2.sh b/targets/support/create-qcow2.sh
new file mode 100755
index 00000000..0073a25c
--- /dev/null
+++ b/targets/support/create-qcow2.sh
@@ -0,0 +1,188 @@
+#!/bin/bash
+
+source ${clst_shdir}/support/functions.sh
+
+## START RUNSCRIPT
+
+# Supported host architectures: all that do UEFI boot and support the tools
+# Script parameters:
+#  - ${1}  output qcow2 file
+
+#
+# Configuration parameters:
+# All sizes are in forms as understood by parted: use MiB, GiB, ... or M, G, ...
+#  - clst_qcow2_size      (internal) size of the qcow2 image (default 20GiB)
+#  - clst_qcow2_efisize   size of the EFI boot partition (default 512MiB)
+#  - clst_qcow2_roottype  type of the root partition (default xfs)
+#
+: "${clst_qcow2_size:=20GiB}"
+: "${clst_qcow2_efisize:=512MiB}"
+: "${clst_qcow2_roottype:=xfs}"
+
+#
+# We only support one set of tools, based on
+#  - mkfs.vfat    ( sys-fs/dosfstools , for the EFI partition )
+#  - mkfs.xfs     ( sys-fs/xfsprogs , this might actually be configurable )
+#  - parted       ( sys-block/parted , for partitioning )
+#  - qemu-nbd     ( app-emulation/qemu , for accessing a qcow2 image file as device )
+#  - qemu-img     ( app-emulation/qemu , for creating a qcow2 image file )
+#
+# Let's assume these are deps of catalyst and thus present.
+#
+
+mymountpoint="${1}.tmp.mnt"
+myqcow2="${1}"
+
+# TODO: find next free device
+modprobe -q nbd
+mydevice=/dev/nbd0
+
+# This script requires slightly more stringent cleanup in case of errors
+# from the moment on when the nbd was set up...
+qcow2die() {
+	echo "Something went wrong. Cleaning up..."
+
+	# here we just ignore errors
+	umount -R "${mymountpoint}/proc"
+	umount -R "${mymountpoint}/sys"
+	umount -R "${mymountpoint}/dev"
+	umount -R "${mymountpoint}/run"
+
+	umount "${mydevice}p1"
+	umount "${mydevice}p2"
+	qemu-nbd -d "${mydevice}"
+
+	die "$@"
+}
+
+# We need a means to execute a script inside the qcow with filesystems mounted
+# Which means reproducing half of catalyst here.
+exec_in_qcow2() {
+	local file_name=$(basename ${1})
+
+	# prepare qcow2 for chrooting
+	mount --types proc /proc "${mymountpoint}/proc"
+	mount --rbind /sys "${mymountpoint}/sys"
+	mount --make-rslave "${mymountpoint}/sys"
+	mount --rbind /dev "${mymountpoint}/dev"
+	mount --make-rslave "${mymountpoint}/dev"
+	mount --bind /run "${mymountpoint}/run"
+	mount --make-slave "${mymountpoint}/run"
+
+	# copy_to_chroot ${1}
+	cp -pPR "${1}" "${mymountpoint}/tmp" || qcow2die
+        # copy_to_chroot ${clst_shdir}/support/chroot-functions.sh
+        cp -pPR "${clst_shdir}/support/chroot-functions.sh" "${mymountpoint}/tmp" || qcow2die
+
+        # Ensure the file has the executable bit set
+        chmod +x "${mymountpoint}/tmp/${file_name}" || qcow2die
+
+        echo "Running ${file_name} in qcow2:"
+        echo "    ${clst_CHROOT} ${mymountpoint} /tmp/${file_name}"
+        ${clst_CHROOT} "${mymountpoint}" "/tmp/${file_name}" || qcow2die
+
+        rm -f "${mymountpoint}/tmp/${file_name}" || qcow2die
+        rm -f "${mymountpoint}/tmp/chroot-functions.sh" || qcow2die
+
+	# cleanup qcow2 dir
+	umount -R "${mymountpoint}/proc" || qcow2die
+	umount -R "${mymountpoint}/sys" || qcow2die
+	umount -R "${mymountpoint}/dev" || qcow2die
+	umount -R "${mymountpoint}/run" || qcow2die
+}
+
+
+echo "Creating a new qcow2 disk image file ${myqcow2}.tmp.qcow2 with size ${clst_qcow2_size/%iB/}"
+qemu-img create -f qcow2 "${myqcow2}.tmp.qcow2" ${clst_qcow2_size/%iB/} || die "Cannot create qcow2 file"
+
+echo "Connecting the qcow2 file to network block device ${mydevice}"
+qemu-nbd -c ${mydevice} -f qcow2 "${myqcow2}.tmp.qcow2" || die "Cannot connect qcow2 file to nbd0"
+
+echo "Creating a GPT disklabel"
+parted -s ${mydevice} mklabel gpt || qcow2die "Cannot create disklabel"
+
+echo "Creating an EFI boot partition"
+parted -s ${mydevice} -- mkpart gentooefi fat32 1M ${clst_qcow2_efisize} || qcow2die "Cannot create EFI partition"
+# mark it as EFI boot partition
+parted -s ${mydevice} -- type 1 C12A7328-F81F-11D2-BA4B-00A0C93EC93B || qcow2die "Cannot set EFI partition UUID"
+# note down name
+mypartefi=${mydevice}p1
+
+echo "Creating the root partition"
+parted -s ${mydevice} -- mkpart gentooroot ${clst_qcow2_roottype} ${clst_qcow2_efisize}GiB -1M || qcow2die "Cannot create root partition"
+# mark it as generic linux filesystem partition
+parted -s ${mydevice} -- type 2 0FC63DAF-8483-4772-8E79-3D69D8477DE4 || qcow2die "Cannot set root partition UUID"
+# note down name
+mypartroot=${mydevice}p2
+
+echo "Re-reading the partition table"
+partprobe ${mydevice} || qcow2die "Probing partition table failed"
+
+echo "Printing the partition table"
+parted -s ${mydevice} -- print || qcow2die "Printing the partition table failed"
+
+echo "Making a vfat filesystem in p1"
+mkfs.fat -v -F 32 -n gentooefi ${mypartefi} || qcow2die "Formatting EFI partition failed"
+
+echo "Making an xfs filesystem in p2"
+mkfs.xfs -L gentooroot ${mypartroot} || qcow2die "Formatting root partition failed"
+
+echo "Printing blkid output"
+blkid ${mydevice}* || qcow2die "blkid failed"
+
+echo "Mounting things at ${mymountpoint}"
+mkdir -p "${mymountpoint}" || qcow2die "Could not create root mount point"
+mount ${mypartroot} "${mymountpoint}" || qcow2die "Could not mount root partition"
+mkdir -p "${mymountpoint}"/boot || qcow2die "Could not create boot mount point"
+mount ${mypartefi} "${mymountpoint}/boot" || qcow2die "Could not mount boot partition"
+
+# copy contents in; the source is the stage dir and not any "iso content"
+echo "Copying files into the mounted directories from ${clst_stage_path}"
+cp -a "${clst_stage_path}"/* "${mymountpoint}/" || qcow2die "Could not copy content into mounted image"
+
+echo "Setting machine-id to empty"
+# We are already running systemd-firstboot in a previous step, so we don't want to run it again.
+# The documented behaviour for an empty machine-id is that systemd generates a new one and commits
+# it on first boot, but otherwise treats the system as already initialized.
+rm -f "${mymountpoint}/etc/machine-id"
+touch "${mymountpoint}/etc/machine-id" || qcow2die "Could not set machine-id to empty"
+
+# now we can chroot in and install grub
+exec_in_qcow2 "${clst_shdir}/support/qcow2-grub-install.sh"
+
+echo "Generating /etc/fstab"
+cat > "${mymountpoint}/etc/fstab" <<END
+# /etc/fstab: static file system information.
+#
+# See the manpage fstab(5) for more information.
+#
+# <fs>                  <mountpoint>    <type>          <opts>          <dump/pass>
+
+LABEL=gentooroot            /               xfs              noatime,rw   0 1
+LABEL=gentooefi             /boot           vfat             defaults     1 2
+
+END
+
+echo "Creating a CONTENTS file ${myqcow2}.CONTENTS"
+pushd "${mymountpoint}/" &> /dev/null || qcow2die "Could not cd into mountpoint"
+ls -laR > "${myqcow2}.CONTENTS"       || qcow2die "Could not create CONTENTS file"
+popd &> /dev/null                     || qcow2die "Could not cd out of mountpoint"
+
+echo "Compressing the CONTENTS file"
+gzip "${myqcow2}.CONTENTS"      || qcow2die "Could not compress the CONTENTS file"
+
+echo "Unmounting things"
+umount "${mymountpoint}/boot" || qcow2die "Could not unmount boot partition"
+umount "${mymountpoint}" || qcow2die "Could not unmount root partition"
+
+echo "Disconnecting ${mydevice}"
+qemu-nbd -d ${mydevice} || qcow2die "Could not disconnect ${mydevice}"
+
+echo "Rewriting the qcow2 file with stream compression to ${myqcow2}"
+qemu-img convert -c -O qcow2 "${myqcow2}.tmp.qcow2" "${myqcow2}" || qcow2die "Could not compress QCOW2 file"
+
+echo "Cleaning up"
+rm "${myqcow2}.tmp.qcow2" || qcow2die "Could not delete uncompressed QCOW2 file"
+rmdir "${mymountpoint}" || qcow2die "Could not remove mountpoint"
+
+# Finished...

[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Andreas K. Hüttel]

commit:     82c8ee5c185c520d80fda3319b260852ebc1ceb2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 20:16:54 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:30:55 2024 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=82c8ee5c

Enable all ethernet network adaptors with dhcp by default

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 targets/support/diskimagefs-update.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/targets/support/diskimagefs-update.sh b/targets/support/diskimagefs-update.sh
index 45d870a5..5204a31f 100755
--- a/targets/support/diskimagefs-update.sh
+++ b/targets/support/diskimagefs-update.sh
@@ -16,6 +16,17 @@ if [[ $(readlink /etc/portage/make.profile) == *systemd* ]] ; then
 # generic    - an image with no means of logging in... needs postprocessing
 #              no services are started
 
+configure_dhcp() {
+	echo "Configuring DHCP on all ethernet devices"
+	cat > /etc/systemd/network/default.network <<'END'
+[Match]
+Name=en*
+
+[Network]
+DHCP=yes
+END
+}
+
 echo "Generating /etc/locale.gen"
 cat > /etc/locale.gen <<END
 en_US ISO-8859-1
@@ -45,6 +56,7 @@ case ${clst_diskimage_type} in
 		passwd -d root || die "Failed removing root password"
 		echo "Running systemd-firstboot"
 		systemd-firstboot --timezone=UTC || die "Failed running systemd-firstboot"
+		configure_dhcp
 		;;
 	*)
 		die "As yet unsupported image type"