[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

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

livecdfs-update: No tmpfs on /lib/firmware

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     4f60b6ab4cc8d5c75efd1ae8f6a821d94f9f2abe
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:56 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4f60b6ab

update-modules doesn't exists anymore.

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     dc712f84a63947636c97cd90fa55799da74767ef
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:05 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=dc712f84

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

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     c6a2fb4944945f99851564508c350370e94cfdb3
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:58 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=c6a2fb49

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

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

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b017baf..1f924c3 100644
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -11,12 +11,6 @@ then
 		/etc/ssh/sshd_config
 fi
 
-# Turn off udev tarball
-sed -i 's:RC_DEVICE_TARBALL="yes":RC_DEVICE_TARBALL="no":' /etc/conf.d/rc
-
-# Turn off udev coldplugging
-sed -i 's:RC_COLDPLUG="yes":RC_COLDPLUG="no":' /etc/conf.d/rc
-
 # Clean up the time and set to UTC
 rm -rf /etc/localtime
 cp /usr/share/zoneinfo/UTC /etc/localtime

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     63e36535a830364948a3ee258e7ab1e13905d6da
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:59 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=63e36535

Fix merging kernel without kerncache enabled.

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

Conflicts:
	targets/support/kmerge.sh

---
 targets/support/kmerge.sh | 109 +++++++++++++++++++++++++---------------------
 1 file changed, 59 insertions(+), 50 deletions(-)

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     3a09613d28b496ac2f51a8886b2f7bc659398e10
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:39:57 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=3a09613d

depscan.sh doesn't exists anymore.

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     0b579e881548e7e5d2fac8b47a36f8d513053c76
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:03 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0b579e88

Fix and improve kernel build when kerncache is enabled.

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

Conflicts:
	targets/support/kmerge.sh

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     7f4db96b5089f251b2fcf4ae48b0055887d1549a
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:04 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=7f4db96b

Don't make cdtar mandatory.

On hppa, we don't need cdtar.

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     12c8ca76588cb2acbe4c51b71bb062581a550e90
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:00 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=12c8ca76

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

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

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

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 80e371c..b4335a5 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -106,9 +106,9 @@ extract_kernels() {
 			mv ${1}/initramfs-* ${1}/${x}.igz
 		fi
 
-		if [ -e ${1}/System.map-* ];
+		if [ -e ${1}/System.map-* ]
 		then
-			mv ${1}/System.map-* ${1}/System.map-${x}
+			mv ${1}/System.map-* ${1}/System-${x}.map
 		fi
 	done
 }

diff --git a/targets/support/netboot2-final.sh b/targets/support/netboot2-final.sh
index 2ee207e..7f85538 100644
--- a/targets/support/netboot2-final.sh
+++ b/targets/support/netboot2-final.sh
@@ -14,7 +14,7 @@ mkdir ${clst_target_path}kernels/misc
 for x in ${clst_boot_kernel}; do
 	mv ${clst_target_path}boot/${x} ${clst_target_path}kernels
 	mv ${clst_target_path}boot/${x}.igz ${clst_target_path}kernels/misc
-	mv ${clst_target_path}boot/System.map* ${clst_target_path}kernels/misc/System.map-${x}
+	mv ${clst_target_path}boot/System-${x}.map ${clst_target_path}kernels/misc
 done
 
 rmdir ${clst_target_path}boot

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     4a0499ea2a49536f13e9f1a40c6571ec86e3f707
Author:     Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  5 10:40:02 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4a0499ea

Make use of _kernelopts for hppa.

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     0c6f5a9dbc74574a33810fac68f70b647752a56d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 06:27:04 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0c6f5a9d

Fix a relative path bug

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

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index 311ed7b..fba855c 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -20,7 +20,7 @@ exec_in_chroot(){
 # and executes it.
 	local file_name=$(basename ${1})
 	local subdir=${2}
-	local destdir=".${subdir}/tmp"
+	local destdir="${subdir}/tmp"
 
 	echo "Copying ${file_name} to ${destdir}"
 	copy_to_chroot ${1} ${destdir}
@@ -33,7 +33,7 @@ exec_in_chroot(){
 	chmod +x ${chroot_path}/${destdir}/${file_name}
 
 	echo "Running ${file_name} in chroot ${chroot_path}"
-	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
+	${clst_CHROOT} ${chroot_path} .${destdir}/${file_name} || exit 1
 
 	delete_from_chroot ${destdir}/${file_name}
 	delete_from_chroot ${destdir}/chroot-functions.sh

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     354e66075d711f757c94ae8a27a5e9d28365456c
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 19:14:35 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri May 16 19:14:35 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=354e6607

kmerge.sh: fix lack of exported clst_make_conf variable

This patch fixes commit:
63e36535a830364948a3ee258e7ab1e13905d6da
Fix merging kernel without kerncache enabled.
Guy Martin <gmsoft <AT> gentoo.org> (Wed Feb  5 02:39:59 2014)
Commited by me, cherry-picked from the 3.0 branch.
Also replace the hard-coded sed make.conf path.

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

diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh
index c1b6a35..9786fdd 100755
--- a/targets/support/kmerge.sh
+++ b/targets/support/kmerge.sh
@@ -263,16 +263,18 @@ else
 	fi
 fi
 
+# temp define this until make.conf path is exported to the bash environment
+export clst_make_conf=/etc/portage/make.conf
 
 # Update USE flag in make.conf
-[ -e ${clst_make_conf} ] && \
+[[ -e ${clst_make_conf} ]] && \
 	echo "USE=\"\${USE} ${clst_kernel_use} build\"" >> ${clst_make_conf}
 
 make_destpath
 
 
 build_kernel
-sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" /etc/portage/make.conf
+sed -i "/USE=\"\${USE} ${clst_kernel_use} \"/d" ${clst_make_conf}
 # grep out the kernel version so that we can do our modules magic
 VER=`grep ^VERSION\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`
 PAT=`grep ^PATCHLEVEL\ \= /usr/src/linux/Makefile | awk '{ print $3 };'`

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

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

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

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

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

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

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     e0e22f1a8db5a1542860382bb2b1ebb78314411f
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 20:06:15 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Thu Sep 11 04:26:53 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e0e22f1a

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

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

Conflicts:
	targets/support/chroot-functions.sh

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Raúl Porcel]

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

Typo

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Raúl Porcel]

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

Fix name of system.map for sparc

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Brian Dolbec]

commit:     bd53f3ca5657e822bdd87643450aec06503a9c16
Author:     Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  3 11:03:34 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sun Dec  7 23:50:35 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=bd53f3ca

modify alpha to use genisoimage

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

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Raúl Porcel]

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

Fix syntax error

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Anthony G. Basile]

commit:     1eabce3a9c15c5caf022e71c1959e8c8f4819fad
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  4 01:48:43 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Mar  4 01:48:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1eabce3a

targets/support/chroot-functions.sh: correct quotes to allow expansion of $1

This is a backport of commit b2473eff.  The single quotes prevented the proper
expansion of $1 in setup_pkgmgr().  Since this is usually called as
`setup_pkgmgr "build"` during stage1 builds, it is surprising this was
not caught earlier.

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Anthony G. Basile]

commit:     fbf94254a714c8d72840faee42cf348eb69b1a43
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  8 21:58:15 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 21:58:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fbf94254

targets/support/chroot-functions.sh: remove machine-id for systemd stages

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

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 6c1a31c..67874a0 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -223,6 +223,7 @@ cleanup_stages() {
 		stage1|stage2|stage3|system)
 			rm -f /var/lib/portage/world
 			touch /var/lib/portage/world
+			rm -f /etc/machine-id
 			;;
 		*)
 			echo "Skipping removal of world file for ${clst_target}"

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Robin H. Johnson]

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

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

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

(cherry picked from commit 0f17e92e40d41c54af7bc863f033f1fdc61f9bf3)

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

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

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Anthony G. Basile]

commit:     716363ebd4796911c6fbebfcd22ce97e1295df33
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 02:01:32 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 02:01:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=716363eb

targets/support/chroot-functions.sh: create an empty machine-id for systemd stages

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

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 67874a03..2ab35141 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -223,7 +223,7 @@ cleanup_stages() {
 		stage1|stage2|stage3|system)
 			rm -f /var/lib/portage/world
 			touch /var/lib/portage/world
-			rm -f /etc/machine-id
+			>/etc/machine-id
 			;;
 		*)
 			echo "Skipping removal of world file for ${clst_target}"

[gentoo-commits] proj/catalyst:2.X commit in: targets/support/

[Anthony G. Basile]

commit:     c30ef3723d222e36dc5c0ebc8d8190f991de73da
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  4 02:37:58 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar  4 02:37:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=c30ef372

Revert "targets/support/chroot-functions.sh: create an empty machine-id for systemd stages"

This reverts commit 716363ebd4796911c6fbebfcd22ce97e1295df33.

This breaks sys-apps/dbus which calls `dbus-uuidgen --ensure=/etc/machine-id`.  If
machine-id exists, it is not overwritten, thus leaving behind an empty machine-id
for non-systemd systems.  It is therefore better to remove the file.

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

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 2ab35141..67874a03 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -223,7 +223,7 @@ cleanup_stages() {
 		stage1|stage2|stage3|system)
 			rm -f /var/lib/portage/world
 			touch /var/lib/portage/world
-			>/etc/machine-id
+			rm -f /etc/machine-id
 			;;
 		*)
 			echo "Skipping removal of world file for ${clst_target}"