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

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

[Matt Turner]

commit:     33eedbd166f355069a4c8ac958f78fdc01c3a6d0
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 11:20:40 2022 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     c21f53e42bf007ad074b0c6b23bfd85564832d46
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 31 13:26:08 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     fd528f28ff1157ced65edb2e821cd16aa68c1802
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:48:27 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     0c26863c06762bb954d283849777dcde1dc0f616
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:54:21 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     79ee199b34761ca2e2204ed687d7b245552d8cf6
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 19:11:28 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     0d3d82f639bb98457df670b6e12455f670887d0a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:02:56 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 19:48:49 2023 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0d3d82f6

targets: Fix CHOST vs `uname -m` confusion

We've had difficulties keeping straight CHOST (e.g. "hppa") vs `uname
-m` output in the past, and I suspect I've made it worse over time.

Fix the issues I spotted, and add a catch-all for architectures we are
missing support for, so if ISO/netboot/etc creation doesn't silently
fail.

mattst88@bogsucker ~ $ uname -m
ppc64le
mattst88@bogsucker ~ $ linux32 uname -m
ppcle

mattst88@timberdoodle ~ $ uname -m
ppc64
mattst88@timberdoodle ~ $ linux32 uname -m
ppc

mattst88@guppy ~ $ uname -m
ia64

mattst88@catbus ~ $ uname -m
sparc64
mattst88@catbus ~ $ linux32 uname -m
sparc

mattst88@jiji ~ $ uname -m
aarch64
mattst88@jiji ~ $ linux32 uname -m
armv8l

mattst88@framework ~ % uname -m
x86_64
mattst88@framework ~ % linux32 uname -m
i686

mattst88@hake ~ $ uname -m
parisc

mattst88@lgentoo4 ~ $ uname -m
s390x
mattst88@lgentoo4 ~ $ linux32 uname -m
s390

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

 targets/support/bootloader-setup.sh | 13 +++++++------
 targets/support/create-iso.sh       | 36 +++++++++++++++++++-----------------
 targets/support/netboot-final.sh    |  8 ++++++--
 targets/support/pre-kmerge.sh       |  2 +-
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index d6d5f96e..73854cb8 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -78,10 +78,7 @@ case ${clst_hostarch} in
 			((bctr=${bctr}+1))
 		done
 	;;
-	arm)
-		# NO SOFTLEVEL SUPPORT YET
-	;;
-	hppa)
+	parisc)
 		# NO SOFTLEVEL SUPPORT YET
 		mkdir -p $1/boot
 
@@ -103,7 +100,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86|i?86)
+	aarch64*|ia64|ppc*|sparc*|i?86|x86_64)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -142,7 +139,7 @@ case ${clst_hostarch} in
 		done
 		memtest_grub $1 >> ${iacfg}
 	;;
-	mips)
+	mips*)
 		# NO SOFTLEVEL SUPPORT YET
 
 		# Mips is an interesting arch -- where most archs will
@@ -202,5 +199,9 @@ case ${clst_hostarch} in
 		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
 		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
 		;;
+	*)
+		echo "Boot loader support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 74c24a1d..7c644bae 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,15 +10,15 @@ case ${clst_hostarch} in
 		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
-	mips)
+	mips*)
 		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
-	ppc*|powerpc*|sparc*)
+	ppc*|sparc*)
 		cdmaker="grub-mkrescue"
 		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
 		;;
-	amd64|arm64|ia64|x86|i?86)
+	aarch64*|ia64|i?86|x86_64)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn
@@ -49,28 +49,28 @@ then
 				amd64)
 					clst_iso_volume_id="Gentoo Linux - AMD64"
 				;;
-				arm)
+				arm*)
 					clst_iso_volume_id="Gentoo Linux - ARM"
 				;;
-				arm64)
+				aarch64*)
 					clst_iso_volume_id="Gentoo Linux - ARM64"
 				;;
-				hppa)
-					clst_iso_volume_id="Gentoo Linux - HPPA"
-				;;
 				ia64)
 					clst_iso_volume_id="Gentoo Linux - IA64"
 				;;
 				m68k)
 					clst_iso_volume_id="Gentoo Linux - M68K"
 				;;
-				mips)
+				mips*)
 					clst_iso_volume_id="Gentoo Linux - MIPS"
 				;;
-				ppc*|powerpc*)
+				parisc)
+					clst_iso_volume_id="Gentoo Linux - HPPA"
+				;;
+				ppc*)
 					clst_iso_volume_id="Gentoo Linux - PowerPC"
 				;;
-				s390)
+				s390*)
 					clst_iso_volume_id="Gentoo Linux - S390"
 				;;
 				sh)
@@ -79,7 +79,7 @@ then
 				sparc*)
 					clst_iso_volume_id="Gentoo Linux - SPARC"
 				;;
-				x86)
+				i?86)
 					clst_iso_volume_id="Gentoo Linux - x86"
 				;;
 				*)
@@ -126,16 +126,14 @@ case ${clst_hostarch} in
 		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
 		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
-	arm)
-	;;
-	hppa)
+	parisc)
 		echo ">> Running mkisofs to create iso image...."
 		run_mkisofs -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		pushd "${clst_target_path}/"
 		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
-	mips)
+	mips*)
 		if [[ ${clst_fstype} != squashfs ]]; then
 			die "SGI LiveCD(s) only support the 'squashfs' fstype!"
 		fi
@@ -191,7 +189,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|i?86)
+	aarch64*|ia64|ppc*|sparc*|i?86|x86_64)
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")
@@ -202,5 +200,9 @@ case ${clst_hostarch} in
 		echo ">> Running grub-mkrescue to create iso image...."
 		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
+	*)
+		echo "ISO support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit  $?

diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh
index fc0de880..fbf0569c 100755
--- a/targets/support/netboot-final.sh
+++ b/targets/support/netboot-final.sh
@@ -20,7 +20,7 @@ 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.
 case ${clst_hostarch} in
-	hppa)
+	parisc)
 		# Only one kernel should be there
 		kname=${clst_boot_kernel[0]}
 		rm -f ${clst_target_path}/${kname}-hppa.lif
@@ -36,7 +36,7 @@ case ${clst_hostarch} in
 
 		;;
 	sparc*)
-		if [ "${clst_subarch}" == "sparc" ]; then
+		if [[ ${clst_hostarch} == sparc ]]; then
 			piggyback=piggyback
 		else
 			piggyback=piggyback64
@@ -46,5 +46,9 @@ case ${clst_hostarch} in
 			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
+	*)
+		echo "Netboot support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index ed825f5f..96be005e 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -4,7 +4,7 @@ RUN_DEFAULT_FUNCS="yes"
 
 source /tmp/chroot-functions.sh
 
-if [[ ${clst_hostarch} == hppa ]]; then
+if [[ ${clst_hostarch} == parisc ]]; then
 	for i in ${clst_boot_kernel}; do
 		case ${i} in
 			*32)

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

[Matt Turner]

commit:     f478e8f34af1a45c706f18a34df7f3efa208d581
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 20:01:32 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     1c67748297c23157c693cfee5f869a0deb9f6802
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  2 20:22:02 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     0a8ca2598868cce8f3289a5f517e4d6f10234d9f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:39:46 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     567981dca789e70eaf53b5bc5240750da56fe04a
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 23:02:28 2022 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     1dfba7ee041d6b1e6a8a7af58f28728a8912a1ab
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:37:43 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     f351f8e56ce00c8c36646b2ade13c4f2c9b96751
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 18:40:38 2023 +0000
Commit:     Matt Turner <mattst88 <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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     5d853732df20b4d41985231a5bbd510709470066
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:02:56 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=5d853732

targets: Fix CHOST vs `uname -m` confusion

We've had difficulties keeping straight CHOST (e.g. "hppa") vs `uname
-m` output in the past, and I suspect I've made it worse over time.

Fix the issues I spotted, and add a catch-all for architectures we are
missing support for, so if ISO/netboot/etc creation doesn't silently
fail.

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

 targets/support/bootloader-setup.sh | 13 +++++++------
 targets/support/create-iso.sh       | 30 ++++++++++++++++--------------
 targets/support/netboot-final.sh    |  8 ++++++--
 targets/support/pre-kmerge.sh       |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 08d25b59..6ca3e38a 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -56,10 +56,7 @@ case ${clst_hostarch} in
 			((bctr=${bctr}+1))
 		done
 	;;
-	arm)
-		# NO SOFTLEVEL SUPPORT YET
-	;;
-	hppa)
+	hppa*)
 		# NO SOFTLEVEL SUPPORT YET
 		mkdir -p $1/boot
 
@@ -81,7 +78,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -119,7 +116,7 @@ case ${clst_hostarch} in
 			echo "" >> ${iacfg}
 		done
 	;;
-	mips)
+	mips*)
 		# NO SOFTLEVEL SUPPORT YET
 
 		# Mips is an interesting arch -- where most archs will
@@ -179,5 +176,9 @@ case ${clst_hostarch} in
 		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
 		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
 		;;
+	*)
+		echo "Boot loader support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8eada6a7..8412f6fb 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,7 +10,7 @@ case ${clst_hostarch} in
 		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
-	mips)
+	mips*)
 		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
@@ -18,7 +18,7 @@ case ${clst_hostarch} in
 		cdmaker="grub-mkrescue"
 		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
 		;;
-	amd64|arm64|ia64|x86)
+	aarch64*|amd64|ia64|x86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn
@@ -49,28 +49,28 @@ then
 				amd64)
 					clst_iso_volume_id="Gentoo Linux - AMD64"
 				;;
-				arm)
+				arm*)
 					clst_iso_volume_id="Gentoo Linux - ARM"
 				;;
-				arm64)
+				aarch64*)
 					clst_iso_volume_id="Gentoo Linux - ARM64"
 				;;
-				hppa)
-					clst_iso_volume_id="Gentoo Linux - HPPA"
-				;;
 				ia64)
 					clst_iso_volume_id="Gentoo Linux - IA64"
 				;;
 				m68k)
 					clst_iso_volume_id="Gentoo Linux - M68K"
 				;;
-				mips)
+				mips*)
 					clst_iso_volume_id="Gentoo Linux - MIPS"
 				;;
+				hppa*)
+					clst_iso_volume_id="Gentoo Linux - HPPA"
+				;;
 				ppc*|powerpc*)
 					clst_iso_volume_id="Gentoo Linux - PowerPC"
 				;;
-				s390)
+				s390*)
 					clst_iso_volume_id="Gentoo Linux - S390"
 				;;
 				sh)
@@ -126,16 +126,14 @@ case ${clst_hostarch} in
 		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
 		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
-	arm)
-	;;
-	hppa)
+	hppa*)
 		echo ">> Running mkisofs to create iso image...."
 		run_mkisofs -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		pushd "${clst_target_path}/"
 		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
-	mips)
+	mips*)
 		if [[ ${clst_fstype} != squashfs ]]; then
 			die "SGI LiveCD(s) only support the 'squashfs' fstype!"
 		fi
@@ -191,7 +189,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)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")
@@ -202,5 +200,9 @@ case ${clst_hostarch} in
 		echo ">> Running grub-mkrescue to create iso image...."
 		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
+	*)
+		echo "ISO support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit  $?

diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh
index 7a26e0f4..3071f698 100755
--- a/targets/support/netboot-final.sh
+++ b/targets/support/netboot-final.sh
@@ -20,7 +20,7 @@ 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.
 case ${clst_hostarch} in
-	hppa)
+	hppa*)
 		# Only one kernel should be there
 		kname=${clst_boot_kernel[0]}
 		rm -f ${clst_target_path}/${kname}-hppa.lif
@@ -36,7 +36,7 @@ case ${clst_hostarch} in
 
 		;;
 	sparc*)
-		if [ "${clst_subarch}" == "sparc" ]; then
+		if [[ ${clst_hostarch} == sparc* ]]; then
 			piggyback=piggyback
 		else
 			piggyback=piggyback64
@@ -46,5 +46,9 @@ case ${clst_hostarch} in
 			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
+	*)
+		echo "Netboot support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index ed825f5f..6f05082e 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -4,7 +4,7 @@ RUN_DEFAULT_FUNCS="yes"
 
 source /tmp/chroot-functions.sh
 
-if [[ ${clst_hostarch} == hppa ]]; then
+if [[ ${clst_hostarch} == hppa* ]]; then
 	for i in ${clst_boot_kernel}; do
 		case ${i} in
 			*32)

[gentoo-commits] proj/catalyst:wip/mattst88 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:wip/mattst88 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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     46c9ad4cfca84d7020b6be9098581ce31d559b55
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 03:49:24 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=46c9ad4c

targets/support/pre-kmerge.sh: 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 4a14fe8d..6f05082e 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:wip/mattst88 commit in: targets/support/

[Matt Turner]

commit:     26f1a66a46f8d170f267696805ed904dfbbcae91
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:02:56 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 03:48:34 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=26f1a66a

targets: Fix CHOST vs `uname -m` confusion

We've had difficulties keeping straight CHOST (e.g. "hppa") vs `uname
-m` output in the past, and I suspect I've made it worse over time.

Fix the issues I spotted, and add a catch-all for architectures we are
missing support for, so if ISO/netboot/etc creation doesn't silently
fail.

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

 targets/support/bootloader-setup.sh | 13 +++++++------
 targets/support/create-iso.sh       | 30 ++++++++++++++++--------------
 targets/support/netboot-final.sh    |  8 ++++++--
 targets/support/pre-kmerge.sh       |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 08d25b59..6ca3e38a 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -56,10 +56,7 @@ case ${clst_hostarch} in
 			((bctr=${bctr}+1))
 		done
 	;;
-	arm)
-		# NO SOFTLEVEL SUPPORT YET
-	;;
-	hppa)
+	hppa*)
 		# NO SOFTLEVEL SUPPORT YET
 		mkdir -p $1/boot
 
@@ -81,7 +78,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -119,7 +116,7 @@ case ${clst_hostarch} in
 			echo "" >> ${iacfg}
 		done
 	;;
-	mips)
+	mips*)
 		# NO SOFTLEVEL SUPPORT YET
 
 		# Mips is an interesting arch -- where most archs will
@@ -179,5 +176,9 @@ case ${clst_hostarch} in
 		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
 		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
 		;;
+	*)
+		echo "Boot loader support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8eada6a7..8412f6fb 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,7 +10,7 @@ case ${clst_hostarch} in
 		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
-	mips)
+	mips*)
 		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
@@ -18,7 +18,7 @@ case ${clst_hostarch} in
 		cdmaker="grub-mkrescue"
 		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
 		;;
-	amd64|arm64|ia64|x86)
+	aarch64*|amd64|ia64|x86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn
@@ -49,28 +49,28 @@ then
 				amd64)
 					clst_iso_volume_id="Gentoo Linux - AMD64"
 				;;
-				arm)
+				arm*)
 					clst_iso_volume_id="Gentoo Linux - ARM"
 				;;
-				arm64)
+				aarch64*)
 					clst_iso_volume_id="Gentoo Linux - ARM64"
 				;;
-				hppa)
-					clst_iso_volume_id="Gentoo Linux - HPPA"
-				;;
 				ia64)
 					clst_iso_volume_id="Gentoo Linux - IA64"
 				;;
 				m68k)
 					clst_iso_volume_id="Gentoo Linux - M68K"
 				;;
-				mips)
+				mips*)
 					clst_iso_volume_id="Gentoo Linux - MIPS"
 				;;
+				hppa*)
+					clst_iso_volume_id="Gentoo Linux - HPPA"
+				;;
 				ppc*|powerpc*)
 					clst_iso_volume_id="Gentoo Linux - PowerPC"
 				;;
-				s390)
+				s390*)
 					clst_iso_volume_id="Gentoo Linux - S390"
 				;;
 				sh)
@@ -126,16 +126,14 @@ case ${clst_hostarch} in
 		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
 		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
-	arm)
-	;;
-	hppa)
+	hppa*)
 		echo ">> Running mkisofs to create iso image...."
 		run_mkisofs -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		pushd "${clst_target_path}/"
 		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
-	mips)
+	mips*)
 		if [[ ${clst_fstype} != squashfs ]]; then
 			die "SGI LiveCD(s) only support the 'squashfs' fstype!"
 		fi
@@ -191,7 +189,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)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")
@@ -202,5 +200,9 @@ case ${clst_hostarch} in
 		echo ">> Running grub-mkrescue to create iso image...."
 		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
+	*)
+		echo "ISO support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit  $?

diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh
index 7a26e0f4..3071f698 100755
--- a/targets/support/netboot-final.sh
+++ b/targets/support/netboot-final.sh
@@ -20,7 +20,7 @@ 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.
 case ${clst_hostarch} in
-	hppa)
+	hppa*)
 		# Only one kernel should be there
 		kname=${clst_boot_kernel[0]}
 		rm -f ${clst_target_path}/${kname}-hppa.lif
@@ -36,7 +36,7 @@ case ${clst_hostarch} in
 
 		;;
 	sparc*)
-		if [ "${clst_subarch}" == "sparc" ]; then
+		if [[ ${clst_hostarch} == sparc* ]]; then
 			piggyback=piggyback
 		else
 			piggyback=piggyback64
@@ -46,5 +46,9 @@ case ${clst_hostarch} in
 			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
+	*)
+		echo "Netboot support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 0dfc835e..4a14fe8d 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -4,7 +4,7 @@ RUN_DEFAULT_FUNCS="yes"
 
 source /tmp/chroot-functions.sh
 
-if [[ ${clst_hostarch} == hppa ]]; then
+if [[ ${clst_hostarch} == hppa* ]]; then
 	for i in ${clst_boot_kernel}; do
 		case ${i} in
 			*32)

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

[Matt Turner]

commit:     4524aa8d8861b6526caa347a5ee5b46884c6098a
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:02:56 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 01:43:21 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4524aa8d

targets: Fix KEYWORDS vs `uname -m` confusion

We've had difficulties keeping straight KEYWORDS (e.g. "hppa") vs `uname
-m` output in the past, and I suspect I've made it worse over time.

Fix the issues I spotted, and add a catch-all for architectures we are
missing support for, so if ISO/netboot/etc creation doesn't silently
fail.

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

 targets/support/bootloader-setup.sh | 13 +++++++------
 targets/support/create-iso.sh       | 30 ++++++++++++++++--------------
 targets/support/netboot-final.sh    |  8 ++++++--
 targets/support/pre-kmerge.sh       |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 08d25b59..6ca3e38a 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -56,10 +56,7 @@ case ${clst_hostarch} in
 			((bctr=${bctr}+1))
 		done
 	;;
-	arm)
-		# NO SOFTLEVEL SUPPORT YET
-	;;
-	hppa)
+	hppa*)
 		# NO SOFTLEVEL SUPPORT YET
 		mkdir -p $1/boot
 
@@ -81,7 +78,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -119,7 +116,7 @@ case ${clst_hostarch} in
 			echo "" >> ${iacfg}
 		done
 	;;
-	mips)
+	mips*)
 		# NO SOFTLEVEL SUPPORT YET
 
 		# Mips is an interesting arch -- where most archs will
@@ -179,5 +176,9 @@ case ${clst_hostarch} in
 		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
 		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
 		;;
+	*)
+		echo "Boot loader support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8eada6a7..8412f6fb 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,7 +10,7 @@ case ${clst_hostarch} in
 		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
-	mips)
+	mips*)
 		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
@@ -18,7 +18,7 @@ case ${clst_hostarch} in
 		cdmaker="grub-mkrescue"
 		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
 		;;
-	amd64|arm64|ia64|x86)
+	aarch64*|amd64|ia64|x86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn
@@ -49,28 +49,28 @@ then
 				amd64)
 					clst_iso_volume_id="Gentoo Linux - AMD64"
 				;;
-				arm)
+				arm*)
 					clst_iso_volume_id="Gentoo Linux - ARM"
 				;;
-				arm64)
+				aarch64*)
 					clst_iso_volume_id="Gentoo Linux - ARM64"
 				;;
-				hppa)
-					clst_iso_volume_id="Gentoo Linux - HPPA"
-				;;
 				ia64)
 					clst_iso_volume_id="Gentoo Linux - IA64"
 				;;
 				m68k)
 					clst_iso_volume_id="Gentoo Linux - M68K"
 				;;
-				mips)
+				mips*)
 					clst_iso_volume_id="Gentoo Linux - MIPS"
 				;;
+				hppa*)
+					clst_iso_volume_id="Gentoo Linux - HPPA"
+				;;
 				ppc*|powerpc*)
 					clst_iso_volume_id="Gentoo Linux - PowerPC"
 				;;
-				s390)
+				s390*)
 					clst_iso_volume_id="Gentoo Linux - S390"
 				;;
 				sh)
@@ -126,16 +126,14 @@ case ${clst_hostarch} in
 		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
 		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
-	arm)
-	;;
-	hppa)
+	hppa*)
 		echo ">> Running mkisofs to create iso image...."
 		run_mkisofs -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		pushd "${clst_target_path}/"
 		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
-	mips)
+	mips*)
 		if [[ ${clst_fstype} != squashfs ]]; then
 			die "SGI LiveCD(s) only support the 'squashfs' fstype!"
 		fi
@@ -191,7 +189,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)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")
@@ -202,5 +200,9 @@ case ${clst_hostarch} in
 		echo ">> Running grub-mkrescue to create iso image...."
 		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
+	*)
+		echo "ISO support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit  $?

diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh
index 7a26e0f4..3071f698 100755
--- a/targets/support/netboot-final.sh
+++ b/targets/support/netboot-final.sh
@@ -20,7 +20,7 @@ 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.
 case ${clst_hostarch} in
-	hppa)
+	hppa*)
 		# Only one kernel should be there
 		kname=${clst_boot_kernel[0]}
 		rm -f ${clst_target_path}/${kname}-hppa.lif
@@ -36,7 +36,7 @@ case ${clst_hostarch} in
 
 		;;
 	sparc*)
-		if [ "${clst_subarch}" == "sparc" ]; then
+		if [[ ${clst_hostarch} == sparc* ]]; then
 			piggyback=piggyback
 		else
 			piggyback=piggyback64
@@ -46,5 +46,9 @@ case ${clst_hostarch} in
 			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
+	*)
+		echo "Netboot support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 0dfc835e..4a14fe8d 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -4,7 +4,7 @@ RUN_DEFAULT_FUNCS="yes"
 
 source /tmp/chroot-functions.sh
 
-if [[ ${clst_hostarch} == hppa ]]; then
+if [[ ${clst_hostarch} == hppa* ]]; then
 	for i in ${clst_boot_kernel}; do
 		case ${i} in
 			*32)

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

[Matt Turner]

commit:     a9fecdaed3d67ec1cc4dcb9e7bb5ee471850e399
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 20 00:02:56 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 00:20:45 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=a9fecdae

targets: Fix KEYWORDS vs `uname -m` confusion

We've had difficulties keeping straight KEYWORDS (e.g. "hppa") vs `uname
-m" output in the past, and I suspect I've made it worse over time.

Fix the issues I spotted, and add a catch-all for architectures we are
missing support for, so if ISO/netboot/etc creation doesn't silently
fail.

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

 targets/support/bootloader-setup.sh | 13 +++++++------
 targets/support/create-iso.sh       | 30 ++++++++++++++++--------------
 targets/support/netboot-final.sh    |  8 ++++++--
 targets/support/pre-kmerge.sh       |  2 +-
 4 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 08d25b59..8cc367f8 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -56,10 +56,7 @@ case ${clst_hostarch} in
 			((bctr=${bctr}+1))
 		done
 	;;
-	arm)
-		# NO SOFTLEVEL SUPPORT YET
-	;;
-	hppa)
+	parisc*)
 		# NO SOFTLEVEL SUPPORT YET
 		mkdir -p $1/boot
 
@@ -81,7 +78,7 @@ case ${clst_hostarch} in
 			echo "--recoverykernel=boot/${x}" >> ${icfg}
 		done
 	;;
-	amd64|arm64|ia64|ppc*|powerpc*|sparc*|x86)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		kern_subdir=/boot
 		iacfg=$1/boot/grub/grub.cfg
 		mkdir -p $1/boot/grub
@@ -119,7 +116,7 @@ case ${clst_hostarch} in
 			echo "" >> ${iacfg}
 		done
 	;;
-	mips)
+	mips*)
 		# NO SOFTLEVEL SUPPORT YET
 
 		# Mips is an interesting arch -- where most archs will
@@ -179,5 +176,9 @@ case ${clst_hostarch} in
 		[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
 		[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
 		;;
+	*)
+		echo "Boot loader support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8eada6a7..f8f605f6 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -10,7 +10,7 @@ case ${clst_hostarch} in
 		cdmaker="xorriso"
 		cdmakerpkg="dev-libs/libisoburn"
 		;;
-	mips)
+	mips*)
 		cdmaker="sgibootcd"
 		cdmakerpkg="sys-boot/sgibootcd"
 		;;
@@ -18,7 +18,7 @@ case ${clst_hostarch} in
 		cdmaker="grub-mkrescue"
 		cdmakerpkg="dev-libs/libisoburn and sys-boot/grub:2"
 		;;
-	amd64|arm64|ia64|x86)
+	aarch64*|amd64|ia64|x86)
 		cdmaker="grub-mkrescue"
 		# grub-mkrescue requires:
 		#  xorriso from libisoburn
@@ -49,28 +49,28 @@ then
 				amd64)
 					clst_iso_volume_id="Gentoo Linux - AMD64"
 				;;
-				arm)
+				arm*)
 					clst_iso_volume_id="Gentoo Linux - ARM"
 				;;
-				arm64)
+				aarch64*)
 					clst_iso_volume_id="Gentoo Linux - ARM64"
 				;;
-				hppa)
-					clst_iso_volume_id="Gentoo Linux - HPPA"
-				;;
 				ia64)
 					clst_iso_volume_id="Gentoo Linux - IA64"
 				;;
 				m68k)
 					clst_iso_volume_id="Gentoo Linux - M68K"
 				;;
-				mips)
+				mips*)
 					clst_iso_volume_id="Gentoo Linux - MIPS"
 				;;
+				parisc*)
+					clst_iso_volume_id="Gentoo Linux - HPPA"
+				;;
 				ppc*|powerpc*)
 					clst_iso_volume_id="Gentoo Linux - PowerPC"
 				;;
-				s390)
+				s390*)
 					clst_iso_volume_id="Gentoo Linux - S390"
 				;;
 				sh)
@@ -126,16 +126,14 @@ case ${clst_hostarch} in
 		echo ">> xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V \"${clst_iso_volume_id}\" -o \"${1}\" \"${clst_target_path}\""
 		xorriso -as genisofs -alpha-boot boot/bootlx -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}" || die "Cannot make ISO image"
 	;;
-	arm)
-	;;
-	hppa)
+	parisc*)
 		echo ">> Running mkisofs to create iso image...."
 		run_mkisofs -R -l -J -V "${clst_iso_volume_id}" -o "${1}" "${clst_target_path}"/
 		pushd "${clst_target_path}/"
 		palo -f boot/palo.conf -C "${1}"
 		popd
 	;;
-	mips)
+	mips*)
 		if [[ ${clst_fstype} != squashfs ]]; then
 			die "SGI LiveCD(s) only support the 'squashfs' fstype!"
 		fi
@@ -191,7 +189,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)
+	aarch64*|amd64|ia64|ppc*|powerpc*|sparc*|x86)
 		isoroot_checksum
 
 		extra_opts=("-joliet" "-iso-level" "3")
@@ -202,5 +200,9 @@ case ${clst_hostarch} in
 		echo ">> Running grub-mkrescue to create iso image...."
 		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
 	;;
+	*)
+		echo "ISO support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit  $?

diff --git a/targets/support/netboot-final.sh b/targets/support/netboot-final.sh
index 7a26e0f4..5e0fef57 100755
--- a/targets/support/netboot-final.sh
+++ b/targets/support/netboot-final.sh
@@ -20,7 +20,7 @@ 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.
 case ${clst_hostarch} in
-	hppa)
+	parisc*)
 		# Only one kernel should be there
 		kname=${clst_boot_kernel[0]}
 		rm -f ${clst_target_path}/${kname}-hppa.lif
@@ -36,7 +36,7 @@ case ${clst_hostarch} in
 
 		;;
 	sparc*)
-		if [ "${clst_subarch}" == "sparc" ]; then
+		if [[ ${clst_hostarch} == sparc* ]]; then
 			piggyback=piggyback
 		else
 			piggyback=piggyback64
@@ -46,5 +46,9 @@ case ${clst_hostarch} in
 			${piggyback} ${clst_target_path}/${x}-a.out ${clst_target_path}/kernels/misc/System-${x}.map ${clst_target_path}/kernels/misc/${x}.igz
 		done
 		;;
+	*)
+		echo "Netboot support for ${clst_hostarch} is unimplemented"
+		exit 1
+	;;
 esac
 exit $?

diff --git a/targets/support/pre-kmerge.sh b/targets/support/pre-kmerge.sh
index 0dfc835e..cf9feceb 100755
--- a/targets/support/pre-kmerge.sh
+++ b/targets/support/pre-kmerge.sh
@@ -4,7 +4,7 @@ RUN_DEFAULT_FUNCS="yes"
 
 source /tmp/chroot-functions.sh
 
-if [[ ${clst_hostarch} == hppa ]]; then
+if [[ ${clst_hostarch} == parisc* ]]; then
 	for i in ${clst_boot_kernel}; do
 		case ${i} in
 			*32)

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

[Matt Turner]

commit:     2d85dcc908a49d5d271c518ba34d637c536e926a
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: Sat Nov 19 23:52:19 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2d85dcc9

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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:     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:wip/mattst88 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/

[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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:     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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:     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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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:     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:wip/mattst88 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:pending/mattst88 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:wip/mattst88 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 ]