| 1 |
commit: f576b58ded510637c463423da3ba4c2648293666 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 18 15:59:18 2011 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 18 16:02:43 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f576b58d |
| 7 |
|
| 8 |
Update catalyst targets to reflect the change from STAGE1_USE to BOOTSTRAP_USE and drop cxx from stage1 target as it was added to BOOTSTRAP_USE. |
| 9 |
|
| 10 |
--- |
| 11 |
targets/stage1/stage1-chroot.sh | 6 +++--- |
| 12 |
targets/support/chroot-functions.sh | 2 +- |
| 13 |
2 files changed, 4 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 16 |
index 550eef7..dadd0f5 100644 |
| 17 |
--- a/targets/stage1/stage1-chroot.sh |
| 18 |
+++ b/targets/stage1/stage1-chroot.sh |
| 19 |
@@ -6,7 +6,7 @@ export clst_buildpkgs="$(/tmp/build.py)" |
| 20 |
source /tmp/chroot-functions.sh |
| 21 |
|
| 22 |
# Setup our environment |
| 23 |
-STAGE1_USE="$(portageq envvar STAGE1_USE)" |
| 24 |
+BOOTSTRAP0_USE="$(portageq envvar BOOTSTRAP_USE)" |
| 25 |
FEATURES="${clst_myfeatures} nodoc noman noinfo -news" |
| 26 |
|
| 27 |
## Sanity check profile |
| 28 |
@@ -31,8 +31,8 @@ make_destpath /tmp/stage1root |
| 29 |
|
| 30 |
# Now, we install our packages |
| 31 |
[ -e /etc/make.conf ] && \ |
| 32 |
- echo "USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"" \ |
| 33 |
+ echo "USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \ |
| 34 |
>> /etc/make.conf |
| 35 |
run_merge "--oneshot ${clst_buildpkgs}" |
| 36 |
-sed -i "/USE=\"-* bindist build cxx ${STAGE1_USE} ${clst_HOSTUSE}\"/d" \ |
| 37 |
+sed -i "/USE=\"-* bindist build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \ |
| 38 |
/etc/make.conf |
| 39 |
|
| 40 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
| 41 |
index 1a44c92..277fdc2 100644 |
| 42 |
--- a/targets/support/chroot-functions.sh |
| 43 |
+++ b/targets/support/chroot-functions.sh |
| 44 |
@@ -291,7 +291,7 @@ show_debug() { |
| 45 |
# `set > /tmp/env_dump.${EBUILD_PHASE}` inside /etc/portage/bashrc |
| 46 |
# XXX: Also, portageq does *not* source profile.bashrc at any time. |
| 47 |
echo |
| 48 |
- echo "STAGE1_USE: $(portageq envvar STAGE1_USE)" |
| 49 |
+ echo "BOOTSTRAP_USE: $(portageq envvar BOOTSTRAP_USE)" |
| 50 |
echo |
| 51 |
echo "USE (profile): $(portageq envvar USE)" |
| 52 |
echo "FEATURES (profile): $(portageq envvar FEATURES)" |
Archives