Drop metadata_overlay support from catalyst - fixes bug 393659.

diff --git a/catalyst b/catalyst
index f05a7bcab9b416eaa8c4a2637c5fcc49e10121c1..ee319fdabf27ab52f092b851608c890b0f522831 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -149,10 +149,6 @@ def parse_config(myconfig):
                print "Snapshot cache support enabled."
                conf_values["SNAPCACHE"]="1"
 
-       if "metadata_overlay" in conf_values["options"].split():
-               print "Use of metadata_overlay module for portage enabled."
-               conf_values["METADATA_OVERLAY"]="1"
-
 #      if "tarball" in string.split(conf_values["options"]):
 #              print "Tarball creation enabled."
 #              conf_values["TARBALL"]="1"

diff --git a/files/catalyst.conf b/files/catalyst.conf
index 5023cedec7870da81f3cd2c11e1d00055b7bdaae..f2d342e16b98bc775d359f43735c5b111a4f6f0c 100644 (file)
--- a/files/catalyst.conf
+++ b/files/catalyst.conf
@@ -55,8 +55,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
@@ -66,7 +64,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/generic_stage_target.py b/modules/generic_stage_target.py
index 55baea7833fc0fc84037593b1eaa8836f201c24e..8badf5e5ff0c0d94d44420757cab351ca0b05437 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -972,18 +972,6 @@ class generic_stage_target(generic_target):
                                        self.settings["chroot_path"]+"/tmp/envscript",\
                                        "Could not copy envscript into place.",env=self.env)
 
-                       """ Setup metadata_overlay """
-                       if self.settings.has_key("METADATA_OVERLAY") \
-                               and not self.settings.has_key("portage_confdir"):
-                               if not os.path.exists(self.settings["chroot_path"]+\
-                                       "/etc/portage"):
-                                       cmd("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