From 9cb9cb0bbdc0fe1ae4a9f41a985c96f54fd08dc0 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Mon, 12 Dec 2011 12:53:38 -0100 Subject: [PATCH] Drop metadata_overlay support from catalyst - fixes bug 393659. --- catalyst | 4 ---- files/catalyst.conf | 4 +--- modules/generic_stage_target.py | 12 ------------ 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/catalyst b/catalyst index f05a7bca..ee319fda 100755 --- 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 5023cede..f2d342e1 100644 --- 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 55baea78..8badf5e5 100644 --- 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 -- 2.26.2