catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages'

W. Trevor King: Refactored Git history for Brian Dolbec's content changes.

Reviewed-by: Matt Turner <mattst88@gentoo.org>
Signed-off-by: W. Trevor King <wking@tremily.us>
Signed-off-by: Brian Dolbec <dolsen@gentoo.org>

diff --git a/catalyst b/catalyst
index 131529ae4c60e7d5717acd5c7252ef6f6c06756d..c62b745326006e7fc59ff5f1bdc43b102263a2c7 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -65,6 +65,7 @@ def parse_config(myconfig):
                "distdir": "/usr/portage/distfiles",
                "hash_function": "crc32",
                "options": "",
+               "packagedir": "/usr/portage/packages",
                "portdir": "/usr/portage",
                "repo_name": "portage",
                "sharedir": "/usr/share/catalyst",

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 63661fe18e8e23028f905e04c96ba0a0c1b5ea32..c8907737794a85cb387409120523bc7de6b313d4 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1068,7 +1068,7 @@ class generic_stage_target(generic_target):
 
                        myf.write('PORTDIR="%s"\n' % self.settings['portdir'])
                        myf.write('DISTDIR="%s"\n' % self.settings['distdir'])
-                       myf.write('PKGDIR="${PORTDIR}/packages"\n')
+                       myf.write('PKGDIR="%s"\n' % self.settings['packagedir'])
 
                        """ Setup the portage overlay """
                        if "portage_overlay" in self.settings: