| 1 |
commit: 95086109d6bd6a9d841c43abd53234ed2a220acf |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 6 10:52:19 2017 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 6 10:52:19 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=95086109 |
| 7 |
|
| 8 |
Fix portage_prefix, output to log some changes and remove unneeded set_portage_prefix. |
| 9 |
|
| 10 |
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> |
| 11 |
|
| 12 |
catalyst/base/stagebase.py | 4 ---- |
| 13 |
targets/support/functions.sh | 11 ++++++++++- |
| 14 |
2 files changed, 10 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 17 |
index f0b62d7..417c198 100644 |
| 18 |
--- a/catalyst/base/stagebase.py |
| 19 |
+++ b/catalyst/base/stagebase.py |
| 20 |
@@ -601,10 +601,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 21 |
log.info('portage_overlay directories are set to: %s', |
| 22 |
' '.join(self.settings['portage_overlay'])) |
| 23 |
|
| 24 |
-# def set_portage_prefix(self): |
| 25 |
-# if "portage_prefix" in self.settings: |
| 26 |
-# self.settings["portage_prefix"] = "" |
| 27 |
- |
| 28 |
def set_overlay(self): |
| 29 |
if self.settings["spec_prefix"] + "/overlay" in self.settings: |
| 30 |
if isinstance(self.settings[self.settings['spec_prefix'] + '/overlay'], str): |
| 31 |
|
| 32 |
diff --git a/targets/support/functions.sh b/targets/support/functions.sh |
| 33 |
index eded8b7..63000a5 100755 |
| 34 |
--- a/targets/support/functions.sh |
| 35 |
+++ b/targets/support/functions.sh |
| 36 |
@@ -24,11 +24,20 @@ prepare_portage() { |
| 37 |
|
| 38 |
clear_portage() { |
| 39 |
# Clean-up USE again |
| 40 |
+ echo "Drop \$CATALYST_USE from USE" |
| 41 |
sed -i "/USE=\"/s/\${CATALYST_USE} //" ${clst_make_conf} |
| 42 |
+ echo "Remove \$CATALYST_USE" |
| 43 |
sed -i "/CATALYST_USE/d" ${clist_make_conf} |
| 44 |
|
| 45 |
if [ -n "${clst_portage_prefix}" ]; then |
| 46 |
- rm -R "${clst_chroot_path}/etc/portage/${clst_portage_prefix}" |
| 47 |
+ echo "Clear ${clst_chroot_path}/etc/portage/package.keywords/${clst_portage_prefix}" |
| 48 |
+ rm -R "${clst_chroot_path}/etc/portage/package.keywords/${clst_portage_prefix}" |
| 49 |
+ echo "Clear ${clst_chroot_path}/etc/portage/package.mask/${clst_portage_prefix}" |
| 50 |
+ rm -R "${clst_chroot_path}/etc/portage/package.mask/${clst_portage_prefix}" |
| 51 |
+ echo "Clear ${clst_chroot_path}/etc/portage/package.unmask/${clst_portage_prefix}" |
| 52 |
+ rm -R "${clst_chroot_path}/etc/portage/package.unmask/${clst_portage_prefix}" |
| 53 |
+ echo "Clear ${clst_chroot_path}/etc/portage/package.use/${clst_portage_prefix}" |
| 54 |
+ rm -R "${clst_chroot_path}/etc/portage/package.use/${clst_portage_prefix}" |
| 55 |
fi |
| 56 |
} |
Archives