From: Andrew Gaffney Date: Sun, 20 Sep 2009 19:44:05 +0000 (-0500) Subject: Remove metadata_overlay option, since it doesn't make sense with >=portage-2.1.6 X-Git-Tag: CATALYST-2.0.10~3^2~92 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43f449cacb34821e2583a52e67cf535da45bceb1;p=catalyst.git Remove metadata_overlay option, since it doesn't make sense with >=portage-2.1.6 --- diff --git a/ChangeLog b/ChangeLog index 57cacfae..db86f15c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ # Distributed under the GPL v2 # $Id$ + 20 Sep 2009; Andrew Gaffney 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 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 088e334c..a6d3c4d9 100755 --- 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 b4e2385f..5e3111c0 100644 --- 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 b2ec42ba..543b255a 100644 --- 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