| 1 |
commit: e643d75151b22c2f5a7b8ae5a309c4114bd728a9 |
| 2 |
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 29 03:17:37 2012 +0000 |
| 4 |
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 29 03:17:37 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e643d751 |
| 7 |
|
| 8 |
Let's see if we can update the seed stage and fix bug 397505. |
| 9 |
|
| 10 |
--- |
| 11 |
modules/stage1_target.py | 5 +++++ |
| 12 |
targets/stage1/stage1-chroot.sh | 2 +- |
| 13 |
2 files changed, 6 insertions(+), 1 deletions(-) |
| 14 |
|
| 15 |
diff --git a/modules/stage1_target.py b/modules/stage1_target.py |
| 16 |
index ea29bb0..773e3c8 100644 |
| 17 |
--- a/modules/stage1_target.py |
| 18 |
+++ b/modules/stage1_target.py |
| 19 |
@@ -13,7 +13,9 @@ class stage1_target(generic_stage_target): |
| 20 |
def __init__(self,spec,addlargs): |
| 21 |
self.required_values=[] |
| 22 |
self.valid_values=["chost"] |
| 23 |
+ self.valid_values.extend(["update_seed"]) |
| 24 |
generic_stage_target.__init__(self,spec,addlargs) |
| 25 |
+ self.set_update_seed() |
| 26 |
|
| 27 |
def set_stage_path(self): |
| 28 |
self.settings["stage_path"]=normpath(self.settings["chroot_path"]+self.settings["root_path"]) |
| 29 |
@@ -95,6 +97,9 @@ class stage1_target(generic_stage_target): |
| 30 |
self.mounts.append("/tmp/stage1root/proc") |
| 31 |
self.mountmap["/tmp/stage1root/proc"]="/proc" |
| 32 |
|
| 33 |
+ def set_update_seed(self): |
| 34 |
+ if self.settings.has_key(self.settings["update_seed"]): |
| 35 |
+ self.settings["update_seed_cache"]=self.settings["update_seed"] |
| 36 |
|
| 37 |
def register(foo): |
| 38 |
foo.update({"stage1":stage1_target}) |
| 39 |
|
| 40 |
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 41 |
index 00f390d..641f5c3 100644 |
| 42 |
--- a/targets/stage1/stage1-chroot.sh |
| 43 |
+++ b/targets/stage1/stage1-chroot.sh |
| 44 |
@@ -25,7 +25,7 @@ fi |
| 45 |
run_merge "--oneshot --nodeps sys-apps/baselayout" |
| 46 |
|
| 47 |
# Update stage3 |
| 48 |
-UPDATE_SEED_STAGE="yes" |
| 49 |
+#UPDATE_SEED_STAGE="yes" |
| 50 |
if [ -n ${UPDATE_SEED_STAGE} ]; then |
| 51 |
echo "Updating seed stage..." |
| 52 |
clst_root_path=/ run_merge "--update --deep --newuse @world" |
Archives