1 |
commit: febc83bc30a210bc14a34b671d3340a2aff8e59e |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 29 00:55:42 2020 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 29 17:48:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=febc83bc |
7 |
|
8 |
targets: Remove some dead code |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
targets/support/chroot-functions.sh | 12 ------------ |
13 |
1 file changed, 12 deletions(-) |
14 |
|
15 |
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh |
16 |
index 82164f64..b09a7531 100755 |
17 |
--- a/targets/support/chroot-functions.sh |
18 |
+++ b/targets/support/chroot-functions.sh |
19 |
@@ -182,17 +182,6 @@ setup_gcc(){ |
20 |
} |
21 |
|
22 |
setup_pkgmgr(){ |
23 |
- # Set bindist USE flag if clst_BINDIST is set |
24 |
- # this is handled independantly in stage2, changes here should be mirrored there |
25 |
- #if [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \ |
26 |
- # && [ -n "${clst_BINDIST}" ]; then |
27 |
- # if grep -q ^USE "${clst_make_conf}"; then |
28 |
- # echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}" |
29 |
- # else |
30 |
- # echo "USE=\"bindist\"" >> "${clst_make_conf}" |
31 |
- # fi |
32 |
- #fi |
33 |
- |
34 |
# We need to merge our package manager with USE="build" set in case it is |
35 |
# portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could |
36 |
# just let emerge @system could merge it. |
37 |
@@ -256,7 +245,6 @@ cleanup_stages() { |
38 |
esac |
39 |
|
40 |
# Remove bindist from use |
41 |
- # this is handled independantly in stage2, changes here should be mirrored there |
42 |
${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}" |
43 |
${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}" |