1 |
commit: b2473eff92e64a13f87c1ba3c0628e3a7a75b5a3 |
2 |
Author: Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 31 03:45:31 2015 +0000 |
4 |
Commit: Richard Farina <zerochaos <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 31 03:45:31 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b2473eff |
7 |
|
8 |
USE=${USE} gets parsed in bash instead of in make.conf, \${USE} prevents the expansion until it is already inside make.conf |
9 |
|
10 |
targets/support/chroot-functions.sh | 10 +++++----- |
11 |
1 file changed, 5 insertions(+), 5 deletions(-) |
12 |
|
13 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
14 |
index 253eee2..4506eef 100755 |
15 |
--- a/targets/support/chroot-functions.sh |
16 |
+++ b/targets/support/chroot-functions.sh |
17 |
@@ -172,12 +172,12 @@ setup_pkgmgr(){ |
18 |
# Use --update or portage might just waste time/cycles and reinstall the same version. |
19 |
# Use --newuse to make sure it rebuilds with any changed use flags. |
20 |
if [ -n "$1" ];then |
21 |
- echo "Adding USE=\"${USE} $1\" to make.conf for portage build" |
22 |
- [ -e "${clst_make_conf}" ] && echo "USE=\"${USE} $1\"" >> "${clst_make_conf}" |
23 |
+ echo "Adding USE=\"\${USE} $1\" to make.conf for portage build" |
24 |
+ [ -e "${clst_make_conf}" ] && echo "USE=\"\${USE} $1\"" >> "${clst_make_conf}" |
25 |
run_merge --oneshot --update --newuse sys-apps/portage |
26 |
- sed -i "/USE=\"${USE} $1\"/d" "${clst_make_conf}" |
27 |
+ sed -i "/USE=\"\${USE} $1\"/d" "${clst_make_conf}" |
28 |
else |
29 |
- echo "Updating portage with USE=\"${USE}\"" |
30 |
+ echo "Updating portage with USE=\"\${USE}\"" |
31 |
run_merge --oneshot --update --newuse sys-apps/portage |
32 |
fi |
33 |
} |
34 |
@@ -270,7 +270,7 @@ run_merge() { |
35 |
export CONFIG_PROTECT="-*" |
36 |
|
37 |
# Set bindist USE flag if clst_BINDIST is set |
38 |
- [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"${USE} bindist\"" >> ${clst_make_conf} |
39 |
+ [ -e ${clst_make_conf} ] && [ -n "${clst_BINDIST}" ] && echo "USE=\"\${USE} bindist\"" >> ${clst_make_conf} |
40 |
|
41 |
if [ -n "${clst_VERBOSE}" ] |
42 |
then |