| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-03-10 18:16:17 +0000 (Mon, 10 Mar 2008) |
| 3 |
New Revision: 1366 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/modules/generic_stage_target.py |
| 8 |
trunk/targets/grp/grp-chroot.sh |
| 9 |
trunk/targets/support/chroot-functions.sh |
| 10 |
Log: |
| 11 |
Fix some spacing on the -* warning, revert Andrew's last change, since it didn't do anything, and clean up the GRP chroot code so it works smarter and set clst_FETCH when clst_grp_type is something other than pkgset. |
| 12 |
|
| 13 |
Modified: trunk/ChangeLog |
| 14 |
=================================================================== |
| 15 |
--- trunk/ChangeLog 2008-03-10 18:06:59 UTC (rev 1365) |
| 16 |
+++ trunk/ChangeLog 2008-03-10 18:16:17 UTC (rev 1366) |
| 17 |
@@ -1,6 +1,13 @@ |
| 18 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 19 |
# $Id: $ |
| 20 |
|
| 21 |
+ 10 Mar 2008; Chris Gianelloni <wolf31o2@g.o> |
| 22 |
+ modules/generic_stage_target.py, targets/grp/grp-chroot.sh, |
| 23 |
+ targets/support/chroot-functions.sh: |
| 24 |
+ Fix some spacing on the -* warning, revert Andrew's last change, since it |
| 25 |
+ didn't do anything, and clean up the GRP chroot code so it works smarter and |
| 26 |
+ set clst_FETCH when clst_grp_type is something other than pkgset. |
| 27 |
+ |
| 28 |
10 Mar 2008; Andrew Gaffney <agaffney@g.o> |
| 29 |
targets/support/chroot-functions.sh: |
| 30 |
Don't set --usepkg and --buildpkg when fetching |
| 31 |
|
| 32 |
Modified: trunk/modules/generic_stage_target.py |
| 33 |
=================================================================== |
| 34 |
--- trunk/modules/generic_stage_target.py 2008-03-10 18:06:59 UTC (rev 1365) |
| 35 |
+++ trunk/modules/generic_stage_target.py 2008-03-10 18:16:17 UTC (rev 1366) |
| 36 |
@@ -1079,7 +1079,8 @@ |
| 37 |
myf.write('USE="'+string.join(myusevars)+'"\n') |
| 38 |
if '-*' in myusevars: |
| 39 |
print "\nWarning!!! " |
| 40 |
- print "\tThe use of -* in " + self.settings["spec_prefix"] + "/use will cause portage to ignore\n" |
| 41 |
+ print "\tThe use of -* in "+self.settings["spec_prefix"]+\ |
| 42 |
+ "/use will cause portage to ignore" |
| 43 |
print "\tpackage.use in the profile and portage_confdir. You've been warned!" |
| 44 |
|
| 45 |
""" Setup the portage overlay """ |
| 46 |
|
| 47 |
Modified: trunk/targets/grp/grp-chroot.sh |
| 48 |
=================================================================== |
| 49 |
--- trunk/targets/grp/grp-chroot.sh 2008-03-10 18:06:59 UTC (rev 1365) |
| 50 |
+++ trunk/targets/grp/grp-chroot.sh 2008-03-10 18:16:17 UTC (rev 1366) |
| 51 |
@@ -5,13 +5,12 @@ |
| 52 |
## START BUILD |
| 53 |
setup_pkgmgr |
| 54 |
|
| 55 |
-if [ "${clst_grp_type}" = "pkgset" ] |
| 56 |
-then |
| 57 |
- export PKGDIR="/tmp/grp/${clst_grp_target}" |
| 58 |
+export DISTDIR="/tmp/grp/${clst_grp_target}" |
| 59 |
+export PKGDIR="/tmp/grp/${clst_grp_target}" |
| 60 |
|
| 61 |
- run_merge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} \ |
| 62 |
- ${clst_grp_packages} || exit 1 |
| 63 |
-else |
| 64 |
- DISTDIR="/tmp/grp/${clst_grp_target}" run_merge --fetchonly \ |
| 65 |
- ${clst_grp_packages} || exit 1 |
| 66 |
+if [ "${clst_grp_type}" != "pkgset" ] |
| 67 |
+then |
| 68 |
+ export clst_FETCH=1 |
| 69 |
fi |
| 70 |
+ |
| 71 |
+run_merge --noreplace ${clst_grp_packages} || exit 1 |
| 72 |
|
| 73 |
Modified: trunk/targets/support/chroot-functions.sh |
| 74 |
=================================================================== |
| 75 |
--- trunk/targets/support/chroot-functions.sh 2008-03-10 18:06:59 UTC (rev 1365) |
| 76 |
+++ trunk/targets/support/chroot-functions.sh 2008-03-10 18:16:17 UTC (rev 1366) |
| 77 |
@@ -119,7 +119,7 @@ |
| 78 |
then |
| 79 |
export bootstrap_opts="-f" |
| 80 |
export clst_myemergeopts="${clst_myemergeopts} -f" |
| 81 |
- elif [ -n "${clst_PKGCACHE}" -a -z "${clst_FETCH}" ] |
| 82 |
+ elif [ -n "${clst_PKGCACHE}" ] |
| 83 |
then |
| 84 |
export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse" |
| 85 |
export bootstrap_opts="-r" |
| 86 |
|
| 87 |
-- |
| 88 |
gentoo-commits@l.g.o mailing list |
Archives