From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-852454-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id 82AF01384B4
for <garchives@archives.gentoo.org>; Sun, 20 Dec 2015 01:13:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E60A5E08B2;
Sun, 20 Dec 2015 01:13:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6C64FE08B2
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Dec 2015 01:13:05 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DFE4333FEB1
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Dec 2015 01:13:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id B0171C6A
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Dec 2015 01:13:01 +0000 (UTC)
From: "Brian Dolbec" <dolsen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" <dolsen@gentoo.org>
Message-ID: <1450573905.1d5d16c965eb7d5d05c8e191c0fac970808ad47a.dolsen@gentoo>
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage2/, targets/support/, targets/tinderbox/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/stage2/stage2-chroot.sh targets/support/livecdfs-update.sh targets/tinderbox/tinderbox-chroot.sh
X-VCS-Directories: targets/stage2/ targets/tinderbox/ targets/support/
X-VCS-Committer: dolsen
X-VCS-Committer-Name: Brian Dolbec
X-VCS-Revision: 1d5d16c965eb7d5d05c8e191c0fac970808ad47a
X-VCS-Branch: master
Date: Sun, 20 Dec 2015 01:13:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 535063d8-aa67-4325-abb5-d14880031b03
X-Archives-Hash: 7aeb504707139d3cbccbdb05cf3c69f3
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