| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-02-04 19:51:35 +0000 (Mon, 04 Feb 2008) |
| 3 |
New Revision: 1272 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/modules/generic_stage_target.py |
| 8 |
trunk/modules/livecd_stage1_target.py |
| 9 |
trunk/targets/stage1/stage1-chroot.sh |
| 10 |
trunk/targets/support/chroot-functions.sh |
| 11 |
Log: |
| 12 |
Added USE=bindist automatically to everything that inherits set_use from generic_stage_target, added USE=bindist to livecd_stage1_target, added USE=bindist to emerge run for stage1, and did some minor cleanup in get_libdir in chroot-functions. |
| 13 |
|
| 14 |
Modified: trunk/ChangeLog |
| 15 |
=================================================================== |
| 16 |
--- trunk/ChangeLog 2008-02-03 20:14:58 UTC (rev 1271) |
| 17 |
+++ trunk/ChangeLog 2008-02-04 19:51:35 UTC (rev 1272) |
| 18 |
@@ -1,6 +1,14 @@ |
| 19 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 20 |
# $Id: $ |
| 21 |
|
| 22 |
+ 04 Feb 2008; Chris Gianelloni <wolf31o2@g.o> |
| 23 |
+ modules/generic_stage_target.py, modules/livecd_stage1_target.py, |
| 24 |
+ targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh: |
| 25 |
+ Added USE=bindist automatically to everything that inherits set_use from |
| 26 |
+ generic_stage_target, added USE=bindist to livecd_stage1_target, added |
| 27 |
+ USE=bindist to emerge run for stage1, and did some minor cleanup in |
| 28 |
+ get_libdir in chroot-functions. |
| 29 |
+ |
| 30 |
03 Feb 2008; Andrew Gaffney <agaffney@g.o> |
| 31 |
targets/support/bootloader-setup.sh: |
| 32 |
Add splashimage= line to grub.conf if /boot/grub/splash.xpm.gz exists |
| 33 |
|
| 34 |
Modified: trunk/modules/generic_stage_target.py |
| 35 |
=================================================================== |
| 36 |
--- trunk/modules/generic_stage_target.py 2008-02-03 20:14:58 UTC (rev 1271) |
| 37 |
+++ trunk/modules/generic_stage_target.py 2008-02-04 19:51:35 UTC (rev 1272) |
| 38 |
@@ -420,6 +420,7 @@ |
| 39 |
if self.settings.has_key("use"): |
| 40 |
if type(self.settings["use"])==types.StringType: |
| 41 |
self.settings["use"]=self.settings["use"].split() |
| 42 |
+ self.settings["use"].append("bindist") |
| 43 |
|
| 44 |
def set_stage_path(self): |
| 45 |
self.settings["stage_path"]=normpath(self.settings["chroot_path"]) |
| 46 |
|
| 47 |
Modified: trunk/modules/livecd_stage1_target.py |
| 48 |
=================================================================== |
| 49 |
--- trunk/modules/livecd_stage1_target.py 2008-02-03 20:14:58 UTC (rev 1271) |
| 50 |
+++ trunk/modules/livecd_stage1_target.py 2008-02-04 19:51:35 UTC (rev 1272) |
| 51 |
@@ -44,8 +44,10 @@ |
| 52 |
generic_stage_target.set_use(self) |
| 53 |
if self.settings.has_key("use"): |
| 54 |
self.settings["use"].append("livecd") |
| 55 |
+ self.settings["use"].append("bindist") |
| 56 |
else: |
| 57 |
self.settings["use"]=["livecd"] |
| 58 |
+ self.settings["use"].append("bindist") |
| 59 |
|
| 60 |
def set_packages(self): |
| 61 |
generic_stage_target.set_packages(self) |
| 62 |
|
| 63 |
Modified: trunk/targets/stage1/stage1-chroot.sh |
| 64 |
=================================================================== |
| 65 |
--- trunk/targets/stage1/stage1-chroot.sh 2008-02-03 20:14:58 UTC (rev 1271) |
| 66 |
+++ trunk/targets/stage1/stage1-chroot.sh 2008-02-04 19:51:35 UTC (rev 1272) |
| 67 |
@@ -26,7 +26,7 @@ |
| 68 |
|
| 69 |
run_emerge "--oneshot --nodeps virtual/baselayout" |
| 70 |
|
| 71 |
-run_emerge "--noreplace --oneshot ${clst_buildpkgs}" |
| 72 |
+USE="bindist" run_emerge "--noreplace --oneshot ${clst_buildpkgs}" |
| 73 |
rm -f /var/lib/portage/world |
| 74 |
touch /var/lib/portage/world |
| 75 |
|
| 76 |
|
| 77 |
Modified: trunk/targets/support/chroot-functions.sh |
| 78 |
=================================================================== |
| 79 |
--- trunk/targets/support/chroot-functions.sh 2008-02-03 20:14:58 UTC (rev 1271) |
| 80 |
+++ trunk/targets/support/chroot-functions.sh 2008-02-04 19:51:35 UTC (rev 1272) |
| 81 |
@@ -36,11 +36,9 @@ |
| 82 |
} |
| 83 |
|
| 84 |
get_libdir() { |
| 85 |
+ ABI=$(portageq envvar ABI) |
| 86 |
DEFAULT_ABI=$(portageq envvar DEFAULT_ABI) |
| 87 |
LIBDIR_default=$(portageq envvar LIBDIR_default) |
| 88 |
- MULTILIB_ABIS=${MULTILIB_ABIS:-"default"} |
| 89 |
- export DEFAULT_ABI=${DEFAULT_ABI:-"default"} |
| 90 |
- export LIBDIR_default=${CONF_LIBDIR:-"lib"} |
| 91 |
|
| 92 |
local abi |
| 93 |
if [ $# -gt 0 ] |
| 94 |
@@ -136,7 +134,6 @@ |
| 95 |
fi |
| 96 |
} |
| 97 |
|
| 98 |
- |
| 99 |
setup_portage(){ |
| 100 |
# portage needs to be merged manually with USE="build" set to avoid frying |
| 101 |
# our make.conf. emerge system could merge it otherwise. |
| 102 |
|
| 103 |
-- |
| 104 |
gentoo-commits@l.g.o mailing list |
Archives