1 |
commit: 7fd5b929311713e393de00767c0a7a6cd5595f6d |
2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 03:10:53 2015 +0000 |
4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 30 03:14:11 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7fd5b929 |
7 |
|
8 |
We need to ensure bindist is set in USE when updating the seed (if we have OPTIONS="bindist"). |
9 |
Fix some typos / broken syntax. |
10 |
|
11 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
12 |
|
13 |
targets/stage1/stage1-chroot.sh | 28 ++++++++++++++++------------ |
14 |
1 file changed, 16 insertions(+), 12 deletions(-) |
15 |
|
16 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
17 |
index 4afc8fe..0c7e85b 100755 |
18 |
--- a/targets/stage1/stage1-chroot.sh |
19 |
+++ b/targets/stage1/stage1-chroot.sh |
20 |
@@ -26,12 +26,19 @@ clst_root_path=/ setup_pkgmgr "build" |
21 |
# Update stage3 |
22 |
if [ -n "${clst_update_seed}" ]; then |
23 |
if [ "${clst_update_seed}" == "yes" ]; then |
24 |
+ # We might need BOOTSTRAP_USE to avoid blocks related to bindist use flag |
25 |
+ [ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BOOTSTRAP_USE}\"" >> ${clst_make_conf} |
26 |
+ |
27 |
echo "Updating seed stage..." |
28 |
if [ -n "${clst_update_seed_command}" ]; then |
29 |
clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" |
30 |
else |
31 |
clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" |
32 |
fi |
33 |
+ |
34 |
+ # Clean-up USE again |
35 |
+ sed -i "/USE=\"${USE} ${BOOTSTRAP_USE}\"/d" ${clst_make_conf} |
36 |
+ |
37 |
elif [ "${clst_update_seed}" != "no" ]; then |
38 |
echo "Invalid setting for update_seed: ${clst_update_seed}" |
39 |
exit 1 |
40 |
@@ -47,22 +54,19 @@ make_destpath /tmp/stage1root |
41 |
|
42 |
## START BUILD |
43 |
# First, we drop in a known-good baselayout |
44 |
-[ -e ${clst_make_conf} ] && \ |
45 |
- echo 'USE="${USE} -build"' >> ${clst_make_conf} |
46 |
+[ -e ${clst_make_conf} ] && echo 'USE="${USE} -build"' >> ${clst_make_conf} |
47 |
run_merge "--oneshot --nodeps sys-apps/baselayout" |
48 |
- |
49 |
-sed -i '/USE="${USE} -build"/d' ${clst_make_conf} |
50 |
+sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} |
51 |
|
52 |
# Now, we install our packages |
53 |
-if [ -e ${clst_make_conf} ] && \ |
54 |
- echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \ |
55 |
+[ -e ${clst_make_conf} ] && |
56 |
+echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} |
57 |
+for useexpand in ${clst_HOSTUSEEXPAND}; do |
58 |
+ x="clst_${useexpand}" |
59 |
+ echo "${useexpand}=\"${!x}\"" \ |
60 |
>> ${clst_make_conf} |
61 |
- for useexpand in ${clst_HOSTUSEEXPAND}; do |
62 |
- x="clst_${useexpand}" |
63 |
- echo "${useexpand}=\"${!x}\"" \ |
64 |
- >> ${clst_make_conf} |
65 |
- done |
66 |
-fi |
67 |
+done |
68 |
+ |
69 |
run_merge "--oneshot ${clst_buildpkgs}" |
70 |
sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \ |
71 |
${clst_make_conf} |