Remove metadata_overlay option, since it doesn't make sense with >=portage-2.1.6

diff --git a/ChangeLog b/ChangeLog
index 57cacfae799f676ddd642d982b2497bdac62f00b..db86f15cb6f4ffdc08dd650ff5c80c0bd58e3984 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 # Distributed under the GPL v2
 # $Id$
 
+  20 Sep 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
+  files/catalyst.conf, modules/catalyst/target/generic_stage.py:
+  Remove metadata_overlay option, since it doesn't make sense with
+  >=portage-2.1.6
+
   19 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/embedded.py, modules/catalyst/target/generic.py,
   modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,

diff --git a/catalyst b/catalyst
index 088e334ca7860cb50117c11bd81cd926840f15a0..a6d3c4d9032b9a6d24c75935478626f3602387b3 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -119,7 +119,6 @@ def parse_config():
                ("purge", "PURGE", "Purge support enabled."),
                ("seedcache", "SEEDCACHE", "Seed cache support enabled."),
                ("snapcache", "SNAPCACHE", "Snapshot cache support enabled."),
-               ("metadata_overlay", "METADATA_OVERLAY", "Use of metadata_overlay module for portage enabled."),
 #              ("tarball", "TARBALL", "Tarball creation enabled.")
        )
 

diff --git a/files/catalyst.conf b/files/catalyst.conf
index b4e2385f401f5e349b3d8e2ed5c4859028360e30..5e3111c0d1ec97d319b60552dbaf19bb5f320dd7 100644 (file)
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -49,8 +49,6 @@ hash_function="crc32"
 # icecream = enables icecream compiler cluster support for building
 # kerncache = keeps a tbz2 of your built kernel and modules (useful if your
 #      build stops in livecd-stage2)
-# metadata_overlay = enabled the metadata_overlay cache module in portage, which
-#      uses the in-tree metadata
 # pkgcache = keeps a tbz2 of every built package (useful if your build stops
 #      prematurely)
 # seedcache = use the build output of a previous target if it exists to speed up
@@ -60,7 +58,7 @@ hash_function="crc32"
 #      your cache. The cache is unlinked before any empty or rm processing, though.
 #
 # (These options can be used together)
-options="autoresume kerncache metadata_overlay pkgcache seedcache snapcache"
+options="autoresume kerncache pkgcache seedcache snapcache"
 
 # portdir specifies the source portage tree used by the snapshot target.
 portdir="/usr/portage"

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index b2ec42ba27f45ebc8a017107d3ff41dd72d9b4dd..543b255af3c23fbeb6c623f554051a0cf04dd3e8 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -710,18 +710,6 @@ class generic_stage_target(generic_target):
 
                                catalyst.util.copy(self.settings["ENVSCRIPT"], self.settings["chroot_path"] + "/tmp/envscript")
 
-                       """ Setup metadata_overlay """
-                       if "METADATA_OVERLAY" in self.settings \
-                               and not "portage_confdir" in self.settings:
-                               if not os.path.exists(self.settings["chroot_path"]+\
-                                       "/etc/portage"):
-                                       catalyst.util.mkdir(self.settings["chroot_path"] + "/etc/portage")
-                               myf=open(self.settings["chroot_path"]+\
-                                       "/etc/portage/modules","a")
-                               myf.write("portdbapi.auxdbmodule = cache.metadata_overlay.database\n")
-                               myf.close()
-
-
                        """
                        Copy over /etc/hosts from the host in case there are any
                        specialties in there