Remove the die on LIBDIR check, since it won't be set on non-multilib profiles. ...

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

diff --git a/ChangeLog b/ChangeLog
index 125f8d4069c88d5ddcc64d345d8415b8d83ee6b9..da751fcb9423f314644491b45ef9a1eba52e69a6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/stage1/stage1-preclean-chroot.sh,
+  targets/stage2/stage2-preclean-chroot.sh,
+  targets/stage3/stage3-preclean-chroot.sh,
+  targets/stage4/stage4-preclean-chroot.sh,
+  targets/support/chroot-functions.sh:
+  Remove the die on LIBDIR check, since it won't be set on non-multilib
+  profiles. We can now run debug in preclean again.
+
   25 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/functions.sh:
   Let's not try to chmod a dangling symlink.

diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index 8e12593f32ad6d9d37d2b0087737fc760e9a9a27..6e8eab33c07e6d5cf90d952c3ffed88f7c26ef21 100755 (executable)
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
-export RUN_DEFAULT_FUNCS="no"
-
 source /tmp/chroot-functions.sh
 
-# Since we didn't run the default functions, we call a couple here.
-update_env_settings
-setup_myfeatures
-
 # Now, some finishing touches to initialize gcc-config....
 unset ROOT
 

diff --git a/targets/stage2/stage2-preclean-chroot.sh b/targets/stage2/stage2-preclean-chroot.sh
index a24cbc5d4a5259d4b3117da212dfb81edef1cc92..ddc9b31f50b7d14c2b9c1174a3d0677ad24f51ad 100755 (executable)
--- a/targets/stage2/stage2-preclean-chroot.sh
+++ b/targets/stage2/stage2-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
-export RUN_DEFAULT_FUNCS="no"
-
 source /tmp/chroot-functions.sh
 
-# Since we didn't run the default functions, we call a couple here.
-update_env_settings
-setup_myfeatures
-
 cleanup_stages
 
 if [ -n "${clst_CCACHE}" ]

diff --git a/targets/stage3/stage3-preclean-chroot.sh b/targets/stage3/stage3-preclean-chroot.sh
index a24cbc5d4a5259d4b3117da212dfb81edef1cc92..ddc9b31f50b7d14c2b9c1174a3d0677ad24f51ad 100755 (executable)
--- a/targets/stage3/stage3-preclean-chroot.sh
+++ b/targets/stage3/stage3-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
-export RUN_DEFAULT_FUNCS="no"
-
 source /tmp/chroot-functions.sh
 
-# Since we didn't run the default functions, we call a couple here.
-update_env_settings
-setup_myfeatures
-
 cleanup_stages
 
 if [ -n "${clst_CCACHE}" ]

diff --git a/targets/stage4/stage4-preclean-chroot.sh b/targets/stage4/stage4-preclean-chroot.sh
index 7b50e046b14ae55f7b404c5fd48cb906fc270737..240e2cbb64c3f107af16124acc40858c6149739c 100755 (executable)
--- a/targets/stage4/stage4-preclean-chroot.sh
+++ b/targets/stage4/stage4-preclean-chroot.sh
@@ -1,13 +1,7 @@
 #!/bin/bash
 
-export RUN_DEFAULT_FUNCS="no"
-
 source /tmp/chroot-functions.sh
 
-# Since we didn't run the default functions, we call a couple here.
-update_env_settings
-setup_myfeatures
-
 if [ -n "${clst_DISTCC}" ]
 then
        cleanup_distcc

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index b88b2d206b1c5a4d8332d19fba3f811d6fb86092..418336cd1c0f2db2a91f2b7a544be9e21544b9be 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -276,26 +276,21 @@ show_debug() {
                echo "STAGE1_USE:            $(portageq envvar STAGE1_USE)"
                echo
                echo "USE (profile):         $(portageq envvar USE)"
-               echo "USE (stage1):          ${USE}"
                echo "FEATURES (profile):    $(portageq envvar FEATURES)"
-               echo "FEATURES (stage1):     ${FEATURES}"
                echo
                echo "ARCH:                  $(portageq envvar ARCH)"
                echo "CHOST:                 $(portageq envvar CHOST)"
                echo "CFLAGS:                $(portageq envvar CFLAGS)"
                echo
-               echo "PROFILE_ARCH:          $(portageq envvar PROFILE_ARCH)"
-               echo
+               echo "These should be blank on non-multilib profiles."
                echo "ABI:                   $(portageq envvar ABI)"
                echo "DEFAULT_ABI:           $(portageq envvar DEFAULT_ABI)"
                echo "KERNEL_ABI:            $(portageq envvar KERNEL_ABI)"
-               echo "MULTILIB_ABIS:         $(portageq envvar MULTILIB_ABIS)"
-               echo
                echo "LIBDIR:                $(get_libdir)"
+               echo "MULTILIB_ABIS:         $(portageq envvar MULTILIB_ABIS)"
+               echo "PROFILE_ARCH:          $(portageq envvar PROFILE_ARCH)"
                echo
        fi
-       [ -z "$(get_libdir)" ] && \
-               echo "Your profile is broken! LIBDIR is empty!" && exit 1
 }
 
 run_default_funcs() {