| 1 |
Author: wolf31o2 |
| 2 |
Date: 2008-04-25 23:59:50 +0000 (Fri, 25 Apr 2008) |
| 3 |
New Revision: 1405 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/ChangeLog |
| 7 |
trunk/targets/stage1/stage1-preclean-chroot.sh |
| 8 |
trunk/targets/stage2/stage2-preclean-chroot.sh |
| 9 |
trunk/targets/stage3/stage3-preclean-chroot.sh |
| 10 |
trunk/targets/stage4/stage4-preclean-chroot.sh |
| 11 |
trunk/targets/support/chroot-functions.sh |
| 12 |
Log: |
| 13 |
Remove the die on LIBDIR check, since it won't be set on non-multilib profiles. We can now run debug in preclean again. |
| 14 |
|
| 15 |
Modified: trunk/ChangeLog |
| 16 |
=================================================================== |
| 17 |
--- trunk/ChangeLog 2008-04-25 23:57:01 UTC (rev 1404) |
| 18 |
+++ trunk/ChangeLog 2008-04-25 23:59:50 UTC (rev 1405) |
| 19 |
@@ -2,6 +2,15 @@ |
| 20 |
# $Id: $ |
| 21 |
|
| 22 |
25 Apr 2008; Chris Gianelloni <wolf31o2@g.o> |
| 23 |
+ targets/stage1/stage1-preclean-chroot.sh, |
| 24 |
+ targets/stage2/stage2-preclean-chroot.sh, |
| 25 |
+ targets/stage3/stage3-preclean-chroot.sh, |
| 26 |
+ targets/stage4/stage4-preclean-chroot.sh, |
| 27 |
+ targets/support/chroot-functions.sh: |
| 28 |
+ Remove the die on LIBDIR check, since it won't be set on non-multilib |
| 29 |
+ profiles. We can now run debug in preclean again. |
| 30 |
+ |
| 31 |
+ 25 Apr 2008; Chris Gianelloni <wolf31o2@g.o> |
| 32 |
targets/support/functions.sh: |
| 33 |
Let's not try to chmod a dangling symlink. |
| 34 |
|
| 35 |
|
| 36 |
Modified: trunk/targets/stage1/stage1-preclean-chroot.sh |
| 37 |
=================================================================== |
| 38 |
--- trunk/targets/stage1/stage1-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404) |
| 39 |
+++ trunk/targets/stage1/stage1-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405) |
| 40 |
@@ -1,13 +1,7 @@ |
| 41 |
#!/bin/bash |
| 42 |
|
| 43 |
-export RUN_DEFAULT_FUNCS="no" |
| 44 |
- |
| 45 |
source /tmp/chroot-functions.sh |
| 46 |
|
| 47 |
-# Since we didn't run the default functions, we call a couple here. |
| 48 |
-update_env_settings |
| 49 |
-setup_myfeatures |
| 50 |
- |
| 51 |
# Now, some finishing touches to initialize gcc-config.... |
| 52 |
unset ROOT |
| 53 |
|
| 54 |
|
| 55 |
Modified: trunk/targets/stage2/stage2-preclean-chroot.sh |
| 56 |
=================================================================== |
| 57 |
--- trunk/targets/stage2/stage2-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404) |
| 58 |
+++ trunk/targets/stage2/stage2-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405) |
| 59 |
@@ -1,13 +1,7 @@ |
| 60 |
#!/bin/bash |
| 61 |
|
| 62 |
-export RUN_DEFAULT_FUNCS="no" |
| 63 |
- |
| 64 |
source /tmp/chroot-functions.sh |
| 65 |
|
| 66 |
-# Since we didn't run the default functions, we call a couple here. |
| 67 |
-update_env_settings |
| 68 |
-setup_myfeatures |
| 69 |
- |
| 70 |
cleanup_stages |
| 71 |
|
| 72 |
if [ -n "${clst_CCACHE}" ] |
| 73 |
|
| 74 |
Modified: trunk/targets/stage3/stage3-preclean-chroot.sh |
| 75 |
=================================================================== |
| 76 |
--- trunk/targets/stage3/stage3-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404) |
| 77 |
+++ trunk/targets/stage3/stage3-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405) |
| 78 |
@@ -1,13 +1,7 @@ |
| 79 |
#!/bin/bash |
| 80 |
|
| 81 |
-export RUN_DEFAULT_FUNCS="no" |
| 82 |
- |
| 83 |
source /tmp/chroot-functions.sh |
| 84 |
|
| 85 |
-# Since we didn't run the default functions, we call a couple here. |
| 86 |
-update_env_settings |
| 87 |
-setup_myfeatures |
| 88 |
- |
| 89 |
cleanup_stages |
| 90 |
|
| 91 |
if [ -n "${clst_CCACHE}" ] |
| 92 |
|
| 93 |
Modified: trunk/targets/stage4/stage4-preclean-chroot.sh |
| 94 |
=================================================================== |
| 95 |
--- trunk/targets/stage4/stage4-preclean-chroot.sh 2008-04-25 23:57:01 UTC (rev 1404) |
| 96 |
+++ trunk/targets/stage4/stage4-preclean-chroot.sh 2008-04-25 23:59:50 UTC (rev 1405) |
| 97 |
@@ -1,13 +1,7 @@ |
| 98 |
#!/bin/bash |
| 99 |
|
| 100 |
-export RUN_DEFAULT_FUNCS="no" |
| 101 |
- |
| 102 |
source /tmp/chroot-functions.sh |
| 103 |
|
| 104 |
-# Since we didn't run the default functions, we call a couple here. |
| 105 |
-update_env_settings |
| 106 |
-setup_myfeatures |
| 107 |
- |
| 108 |
if [ -n "${clst_DISTCC}" ] |
| 109 |
then |
| 110 |
cleanup_distcc |
| 111 |
|
| 112 |
Modified: trunk/targets/support/chroot-functions.sh |
| 113 |
=================================================================== |
| 114 |
--- trunk/targets/support/chroot-functions.sh 2008-04-25 23:57:01 UTC (rev 1404) |
| 115 |
+++ trunk/targets/support/chroot-functions.sh 2008-04-25 23:59:50 UTC (rev 1405) |
| 116 |
@@ -276,26 +276,21 @@ |
| 117 |
echo "STAGE1_USE: $(portageq envvar STAGE1_USE)" |
| 118 |
echo |
| 119 |
echo "USE (profile): $(portageq envvar USE)" |
| 120 |
- echo "USE (stage1): ${USE}" |
| 121 |
echo "FEATURES (profile): $(portageq envvar FEATURES)" |
| 122 |
- echo "FEATURES (stage1): ${FEATURES}" |
| 123 |
echo |
| 124 |
echo "ARCH: $(portageq envvar ARCH)" |
| 125 |
echo "CHOST: $(portageq envvar CHOST)" |
| 126 |
echo "CFLAGS: $(portageq envvar CFLAGS)" |
| 127 |
echo |
| 128 |
- echo "PROFILE_ARCH: $(portageq envvar PROFILE_ARCH)" |
| 129 |
- echo |
| 130 |
+ echo "These should be blank on non-multilib profiles." |
| 131 |
echo "ABI: $(portageq envvar ABI)" |
| 132 |
echo "DEFAULT_ABI: $(portageq envvar DEFAULT_ABI)" |
| 133 |
echo "KERNEL_ABI: $(portageq envvar KERNEL_ABI)" |
| 134 |
+ echo "LIBDIR: $(get_libdir)" |
| 135 |
echo "MULTILIB_ABIS: $(portageq envvar MULTILIB_ABIS)" |
| 136 |
+ echo "PROFILE_ARCH: $(portageq envvar PROFILE_ARCH)" |
| 137 |
echo |
| 138 |
- echo "LIBDIR: $(get_libdir)" |
| 139 |
- echo |
| 140 |
fi |
| 141 |
- [ -z "$(get_libdir)" ] && \ |
| 142 |
- echo "Your profile is broken! LIBDIR is empty!" && exit 1 |
| 143 |
} |
| 144 |
|
| 145 |
run_default_funcs() { |
| 146 |
|
| 147 |
-- |
| 148 |
gentoo-commits@l.g.o mailing list |
Archives