* [gentoo-commits] catalyst r1405 - in trunk: . targets/stage1 targets/stage2 targets/stage3 targets/stage4 targets/support
@ 2008-04-25 23:59 Chris Gianelloni (wolf31o2)
0 siblings, 0 replies; only message in thread
From: Chris Gianelloni (wolf31o2) @ 2008-04-25 23:59 UTC (permalink / raw
To: gentoo-commits
Author: wolf31o2
Date: 2008-04-25 23:59:50 +0000 (Fri, 25 Apr 2008)
New Revision: 1405
Modified:
trunk/ChangeLog
trunk/targets/stage1/stage1-preclean-chroot.sh
trunk/targets/stage2/stage2-preclean-chroot.sh
trunk/targets/stage3/stage3-preclean-chroot.sh
trunk/targets/stage4/stage4-preclean-chroot.sh
trunk/targets/support/chroot-functions.sh
Log:
Remove the die on LIBDIR check, since it won't be set on non-multilib profiles. We can now run debug in preclean again.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-04-25 23:57:01 UTC (rev 1404)
+++ trunk/ChangeLog 2008-04-25 23:59:50 UTC (rev 1405)
@@ -2,6 +2,15 @@
# $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.
Modified: trunk/targets/stage1/stage1-preclean-chroot.sh
===================================================================
--- trunk/targets/stage1/stage1-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404)
+++ trunk/targets/stage1/stage1-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405)
@@ -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
Modified: trunk/targets/stage2/stage2-preclean-chroot.sh
===================================================================
--- trunk/targets/stage2/stage2-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404)
+++ trunk/targets/stage2/stage2-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405)
@@ -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}" ]
Modified: trunk/targets/stage3/stage3-preclean-chroot.sh
===================================================================
--- trunk/targets/stage3/stage3-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404)
+++ trunk/targets/stage3/stage3-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405)
@@ -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}" ]
Modified: trunk/targets/stage4/stage4-preclean-chroot.sh
===================================================================
--- trunk/targets/stage4/stage4-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404)
+++ trunk/targets/stage4/stage4-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405)
@@ -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
Modified: trunk/targets/support/chroot-functions.sh
===================================================================
--- trunk/targets/support/chroot-functions.sh 2008-04-25 23:57:01 UTC (rev 1404)
+++ trunk/targets/support/chroot-functions.sh 2008-04-25 23:59:50 UTC (rev 1405)
@@ -276,26 +276,21 @@
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 "LIBDIR: $(get_libdir)"
echo "MULTILIB_ABIS: $(portageq envvar MULTILIB_ABIS)"
+ echo "PROFILE_ARCH: $(portageq envvar PROFILE_ARCH)"
echo
- echo "LIBDIR: $(get_libdir)"
- echo
fi
- [ -z "$(get_libdir)" ] && \
- echo "Your profile is broken! LIBDIR is empty!" && exit 1
}
run_default_funcs() {
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-04-25 23:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-25 23:59 [gentoo-commits] catalyst r1405 - in trunk: . targets/stage1 targets/stage2 targets/stage3 targets/stage4 targets/support Chris Gianelloni (wolf31o2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox