From 14c4611ffc8e2b236688c2b835edd0c7de01e3ff Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Mon, 4 Feb 2008 19:51:35 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1272 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 8 ++++++++ modules/generic_stage_target.py | 1 + modules/livecd_stage1_target.py | 2 ++ targets/stage1/stage1-chroot.sh | 2 +- targets/support/chroot-functions.sh | 5 +---- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb44ada3..ef364951 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 04 Feb 2008; Chris Gianelloni + 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 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 1e99f243..457669c1 100644 --- 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 5e989d0b..0d5c97c8 100644 --- 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 18430a21..ef5cad22 100755 --- 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 6f80b9e7..6e721416 100755 --- 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. -- 2.26.2