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

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

[Brian Dolbec]

commit:     1d5d16c965eb7d5d05c8e191c0fac970808ad47a
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 17:59:46 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 01:11:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1d5d16c9

targets: Remove some more hard-coded portdir paths

 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 6f69a62..3b44868 100755
--- a/targets/stage2/stage2-chroot.sh
+++ b/targets/stage2/stage2-chroot.sh
@@ -18,7 +18,7 @@ fi
 
 
 ## START BUILD
-/usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
+${clst_portdir}/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 e10826d..c13a61f 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	/usr/portage			tmpfs	defaults	0 0" >> /etc/fstab
+echo "tmpfs	${clst_portdir}			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 /usr/portage/profiles /usr/livecd
-		cp -r /usr/portage/eclass /usr/livecd
+		cp -r ${clst_portdir}/profiles /usr/livecd
+		cp -r ${clst_portdir}/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 b93b4c1..c8ec529 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 "/usr/portage/" / \
+rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "${clst_portdir}/" / \
 	/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 \
-		"/usr/portage/" /tmp/rsync-bak/ /
+		"${clst_portdir}/" /tmp/rsync-bak/ /
 done