| 1 |
commit: 1d5d16c965eb7d5d05c8e191c0fac970808ad47a |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 15 17:59:46 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 20 01:11:45 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1d5d16c9 |
| 7 |
|
| 8 |
targets: Remove some more hard-coded portdir paths |
| 9 |
|
| 10 |
targets/stage2/stage2-chroot.sh | 2 +- |
| 11 |
targets/support/livecdfs-update.sh | 6 +++--- |
| 12 |
targets/tinderbox/tinderbox-chroot.sh | 4 ++-- |
| 13 |
3 files changed, 6 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/targets/stage2/stage2-chroot.sh b/targets/stage2/stage2-chroot.sh |
| 16 |
index 6f69a62..3b44868 100755 |
| 17 |
--- a/targets/stage2/stage2-chroot.sh |
| 18 |
+++ b/targets/stage2/stage2-chroot.sh |
| 19 |
@@ -18,7 +18,7 @@ fi |
| 20 |
|
| 21 |
|
| 22 |
## START BUILD |
| 23 |
-/usr/portage/scripts/bootstrap.sh ${bootstrap_opts} || exit 1 |
| 24 |
+${clst_portdir}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1 |
| 25 |
|
| 26 |
# Clean-up USE again |
| 27 |
sed -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}" |
| 28 |
|
| 29 |
diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh |
| 30 |
index e10826d..c13a61f 100755 |
| 31 |
--- a/targets/support/livecdfs-update.sh |
| 32 |
+++ b/targets/support/livecdfs-update.sh |
| 33 |
@@ -95,7 +95,7 @@ echo "####################################################" >> /etc/fstab |
| 34 |
|
| 35 |
# fstab tweaks |
| 36 |
echo "tmpfs / tmpfs defaults 0 0" >> /etc/fstab |
| 37 |
-echo "tmpfs /usr/portage tmpfs defaults 0 0" >> /etc/fstab |
| 38 |
+echo "tmpfs ${clst_portdir} tmpfs defaults 0 0" >> /etc/fstab |
| 39 |
# If /usr/lib/X11/xkb/compiled then make it tmpfs |
| 40 |
if [ -d /usr/lib/X11/xkb/compiled ] |
| 41 |
then |
| 42 |
@@ -299,8 +299,8 @@ case ${clst_livecd_type} in |
| 43 |
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 |
| 44 |
|
| 45 |
# This is my hack to reduce tmpfs usage |
| 46 |
- cp -r /usr/portage/profiles /usr/livecd |
| 47 |
- cp -r /usr/portage/eclass /usr/livecd |
| 48 |
+ cp -r ${clst_portdir}/profiles /usr/livecd |
| 49 |
+ cp -r ${clst_portdir}/eclass /usr/livecd |
| 50 |
rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*} |
| 51 |
mv -f /etc/gconf /usr/livecd |
| 52 |
ln -sf /usr/livecd/gconf /etc/gconf |
| 53 |
|
| 54 |
diff --git a/targets/tinderbox/tinderbox-chroot.sh b/targets/tinderbox/tinderbox-chroot.sh |
| 55 |
index b93b4c1..c8ec529 100755 |
| 56 |
--- a/targets/tinderbox/tinderbox-chroot.sh |
| 57 |
+++ b/targets/tinderbox/tinderbox-chroot.sh |
| 58 |
@@ -7,7 +7,7 @@ setup_pkgmgr |
| 59 |
|
| 60 |
# Backup pristine system |
| 61 |
|
| 62 |
-rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "/usr/portage/" / \ |
| 63 |
+rsync -avx --exclude "/root/" --exclude "/tmp/" --exclude "${clst_portdir}/" / \ |
| 64 |
/tmp/rsync-bak/ |
| 65 |
|
| 66 |
for x in ${clst_tinderbox_packages} |
| 67 |
@@ -29,5 +29,5 @@ do |
| 68 |
fi |
| 69 |
echo "Syncing from original pristine tinderbox snapshot..." |
| 70 |
rsync -avx --delete --exclude "/root/*" --exclude "/tmp/" --exclude \ |
| 71 |
- "/usr/portage/" /tmp/rsync-bak/ / |
| 72 |
+ "${clst_portdir}/" /tmp/rsync-bak/ / |
| 73 |
done |
Archives