Added USE=bindist automatically to everything that inherits set_use from generic_stag...

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1272 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index cb44ada38bc12664712393fe5f6df77ff73b41a1..ef36495194971b34be09b8b9990b779c03302f87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  04 Feb 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py, modules/livecd_stage1_target.py,
+  targets/stage1/stage1-chroot.sh, targets/support/chroot-functions.sh:
+  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.
+
   03 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/bootloader-setup.sh:
   Add splashimage= line to grub.conf if /boot/grub/splash.xpm.gz exists

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 1e99f2433ab42054e8d5ab1cf224b2d7937ea18f..457669c11d376d4717cbeac0526c2414ee8d63e0 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -420,6 +420,7 @@ class generic_stage_target(generic_target):
                if self.settings.has_key("use"):
                    if type(self.settings["use"])==types.StringType:
                        self.settings["use"]=self.settings["use"].split()
+                       self.settings["use"].append("bindist")
 
        def set_stage_path(self):
                        self.settings["stage_path"]=normpath(self.settings["chroot_path"])

diff --git a/modules/livecd_stage1_target.py b/modules/livecd_stage1_target.py
index 5e989d0b42f4509e78047f065592fa5d3ba1d6ae..0d5c97c8a129eefdf4fa41dfbd6b38f40c1da099 100644 (file)
--- a/modules/livecd_stage1_target.py
+++ b/modules/livecd_stage1_target.py
@@ -44,8 +44,10 @@ class livecd_stage1_target(generic_stage_target):
                generic_stage_target.set_use(self)
                if self.settings.has_key("use"):
                        self.settings["use"].append("livecd")
+                       self.settings["use"].append("bindist")
                else:
                        self.settings["use"]=["livecd"]
+                       self.settings["use"].append("bindist")
 
        def set_packages(self):
                generic_stage_target.set_packages(self)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 18430a211f1bb95621629e043562775fbb621bd3..ef5cad2256ab51b26852e25944ace0df81bfe5ec 100755 (executable)
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -26,7 +26,7 @@ clst_root_path=/ setup_portage
 
 run_emerge "--oneshot --nodeps virtual/baselayout"
 
-run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
+USE="bindist" run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
 rm -f /var/lib/portage/world
 touch /var/lib/portage/world
 

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 6f80b9e7477c2ce42380627d47df1b6879b461f1..6e721416e541cde5ea8fb2f8268029d88cf1078a 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -36,11 +36,9 @@ check_genkernel_version(){
 }
 
 get_libdir() {
+       ABI=$(portageq envvar ABI)
        DEFAULT_ABI=$(portageq envvar DEFAULT_ABI)
        LIBDIR_default=$(portageq envvar LIBDIR_default)
-       MULTILIB_ABIS=${MULTILIB_ABIS:-"default"}
-       export DEFAULT_ABI=${DEFAULT_ABI:-"default"}
-       export LIBDIR_default=${CONF_LIBDIR:-"lib"}
 
        local abi
        if [ $# -gt 0 ]
@@ -136,7 +134,6 @@ setup_myemergeopts(){
        fi
 }
 
-
 setup_portage(){
        # portage needs to be merged manually with USE="build" set to avoid frying
        # our make.conf. emerge system could merge it otherwise.