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

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

[Brian Dolbec]

commit:     b8c668164ca2fb5538e91f3817d95e5a2f890955
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  7 04:02:28 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 05:15:51 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b8c66816

Catalyst: Fix regression from commit: 1d5d16c965 Remove hard coded portdir paths

Convert all clst_portdir use to the new clst_repo_basedir and clst_repo_name variables.
This de-couples the target setting from the source portdir setting for the source repo.
Without this if the source repo was not the same as theses two combined, it would fail to find
it's target scripts and information.

 targets/stage2/stage2-chroot.sh       | 2 +-
 targets/support/livecdfs-update.sh    | 6 +++---
 targets/tinderbox/tinderbox-chroot.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh
index 3b44868..38dfea3 100755
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -18,7 +18,7 @@ fi
 
 
 ## START BUILD
-${clst_portdir}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
+${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
 
 # Clean-up USE again
 sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}"

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index c13a61f..31cdf04 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -95,7 +95,7 @@ echo "####################################################" >> /etc/fstab
 
 # fstab tweaks
 echo "tmpfs	/					tmpfs	defaults	0 0" >> /etc/fstab
-echo "tmpfs	${clst_portdir}			tmpfs	defaults	0 0" >> /etc/fstab
+echo "tmpfs	${clst_repo_basedir}/${clst_repo_name}			tmpfs	defaults	0 0" >> /etc/fstab
 # If /usr/lib/X11/xkb/compiled then make it tmpfs
 if [ -d /usr/lib/X11/xkb/compiled ]
 then
@@ -299,8 +299,8 @@ case ${clst_livecd_type} in
 		USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
 
 		# This is my hack to reduce tmpfs usage
-		cp -r ${clst_portdir}/profiles /usr/livecd
-		cp -r ${clst_portdir}/eclass /usr/livecd
+		cp -r ${clst_repo_basedir}/${clst_repo_name}/profiles /usr/livecd
+		cp -r ${clst_repo_basedir}/${clst_repo_name}/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 /etc/gconf /usr/livecd
 		ln -sf /usr/livecd/gconf /etc/gconf

diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh
index c8ec529..431912e 100755
--- a/targets/tinderbox/tinderbox-chroot.sh
+++ b/targets/tinderbox/tinderbox-chroot.sh
@@ -7,7 +7,7 @@ setup_pkgmgr
 
 # Backup pristine system
 
-rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "${clst_portdir}/" / \
+rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "${clst_repo_basedir}/${clst_repo_name}/" / \
 	/tmp/rsync-bak/
 
 for x in ${clst_tinderbox_packages}
@@ -29,5 +29,5 @@ do
 	fi
 	echo "Syncing from original pristine tinderbox snapshot..."
 	rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \
-		"${clst_portdir}/" /tmp/rsync-bak/ /
+		"${clst_repo_basedir}/${clst_repo_name}/" /tmp/rsync-bak/ /
 done