* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2011-11-06 4:01 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-11-06 4:01 UTC (permalink / raw
To: gentoo-commits
commit: 1411e723ea2ee746c0d31bbe1c180e2cdc71fcd1
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 6 03:59:01 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 03:59:54 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1411e723
Stop dropping /etc/portage on stage3 - bug 388283.
---
modules/stage3_target.py | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/modules/stage3_target.py b/modules/stage3_target.py
index 7e087cb..6ebdc49 100644
--- a/modules/stage3_target.py
+++ b/modules/stage3_target.py
@@ -22,7 +22,6 @@ class stage3_target(generic_stage_target):
def set_cleanables(self):
generic_stage_target.set_cleanables(self)
- self.settings["cleanables"].extend(["/etc/portage"])
def register(foo):
foo.update({"stage3":stage3_target})
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2012-04-18 22:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-04-18 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 15b8d65c6d423779abb042df0c643eaa11e861a0
Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 16:51:12 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 22:32:08 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=15b8d65c
add /etc/make.profile to cleanables too
---
modules/stage3_target.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/modules/stage3_target.py b/modules/stage3_target.py
index 6ebdc49..351ad0c 100644
--- a/modules/stage3_target.py
+++ b/modules/stage3_target.py
@@ -22,6 +22,8 @@ class stage3_target(generic_stage_target):
def set_cleanables(self):
generic_stage_target.set_cleanables(self)
+ # Not sure where /etc/make.profile is being created
+ self.settings["cleanables"].extend(["/etc/make.profile"])
def register(foo):
foo.update({"stage3":stage3_target})
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2012-04-18 22:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-04-18 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 4f934b357c0446ceb0a089d7e3a88a0f8d573092
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 22:34:22 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 22:34:22 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4f934b35
Current stage3 files already provide /etc/portage, so don't fail if it already exists.
---
modules/generic_stage_target.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 56b91bd..26e16d0 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -815,7 +815,7 @@ class generic_stage_target(generic_target):
print "Configuring profile link..."
cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
"Error zapping profile link",env=self.env)
- cmd("mkdir "+self.settings["chroot_path"]+"/etc/portage/")
+ cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/")
cmd("ln -sf ../../usr/portage/profiles/"+\
self.settings["target_profile"]+" "+\
self.settings["chroot_path"]+"/etc/portage/make.profile",\
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2012-05-05 19:14 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-05-05 19:14 UTC (permalink / raw
To: gentoo-commits
commit: 0ff044437195c43685167b0c9054e2ac9ec05a6a
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat May 5 19:10:44 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat May 5 19:10:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=0ff04443
Revert 97b38787d5e72ef091e1673ed37131b8ad97d6be (moving make.profile from /etc to /etc/portage) until we document it and make everything work with it.
---
modules/generic_stage_target.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 26e16d0..7a5d0a0 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -813,12 +813,12 @@ class generic_stage_target(generic_target):
# TODO: zmedico and I discussed making this a directory and pushing
# in a parent file, as well as other user-specified configuration.
print "Configuring profile link..."
- cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
+ cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.profile",\
"Error zapping profile link",env=self.env)
cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/")
cmd("ln -sf ../../usr/portage/profiles/"+\
self.settings["target_profile"]+" "+\
- self.settings["chroot_path"]+"/etc/portage/make.profile",\
+ self.settings["chroot_path"]+"/etc/make.profile",\
"Error creating profile link",env=self.env)
touch(self.settings["autoresume_path"]+"config_profile_link")
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2012-05-06 23:32 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-05-06 23:32 UTC (permalink / raw
To: gentoo-commits
commit: 2b2decf4cfc01ad83fec687957d117e8bde23f58
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun May 6 23:27:27 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun May 6 23:27:27 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2b2decf4
Stop dropping /etc/portage from the stages and update its contents from portage_confdir.
---
modules/generic_stage_target.py | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 7a5d0a0..5c15609 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -830,10 +830,8 @@ class generic_stage_target(generic_target):
else:
if self.settings.has_key("portage_confdir"):
print "Configuring /etc/portage..."
- cmd("rm -rf "+self.settings["chroot_path"]+"/etc/portage",\
- "Error zapping /etc/portage",env=self.env)
- cmd("cp -R "+self.settings["portage_confdir"]+"/ "+\
- self.settings["chroot_path"]+"/etc/portage",\
+ cmd("rsync -a "+self.settings["portage_confdir"]+"/ "+\
+ self.settings["chroot_path"]+"/etc/portage/",\
"Error copying /etc/portage",env=self.env)
touch(self.settings["autoresume_path"]+"setup_confdir")
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2012-05-10 16:30 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-05-10 16:30 UTC (permalink / raw
To: gentoo-commits
commit: 95afbf86f6a31191223cab7b2f024a3a707ce5fb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 16:27:14 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu May 10 16:27:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=95afbf86
Revert drop of /etc/make.profile since the move to /etc/portage/make.profile was reverted.
---
modules/stage3_target.py | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/modules/stage3_target.py b/modules/stage3_target.py
index 351ad0c..6ebdc49 100644
--- a/modules/stage3_target.py
+++ b/modules/stage3_target.py
@@ -22,8 +22,6 @@ class stage3_target(generic_stage_target):
def set_cleanables(self):
generic_stage_target.set_cleanables(self)
- # Not sure where /etc/make.profile is being created
- self.settings["cleanables"].extend(["/etc/make.profile"])
def register(foo):
foo.update({"stage3":stage3_target})
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/
@ 2012-05-13 18:10 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 7+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-05-13 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 98727c755fdf5ecc1863e29f50da02b55ce5160c
Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 15:58:25 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun May 13 18:02:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=98727c75
s:/etc/make.profile:/etc/portage/make.profile:g - Use new location
Take 2, specify target symlink better and create /etc/portage first
(fails with stage2 otherwise)
Conflicts:
modules/generic_stage_target.py
targets/stage1/stage1-controller.sh
---
modules/generic_stage_target.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 44b314a..5947e9a 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -813,12 +813,12 @@ class generic_stage_target(generic_target):
# TODO: zmedico and I discussed making this a directory and pushing
# in a parent file, as well as other user-specified configuration.
print "Configuring profile link..."
- cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.profile",\
+ cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
"Error zapping profile link",env=self.env)
cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/")
cmd("ln -sf ../../usr/portage/profiles/"+\
self.settings["target_profile"]+" "+\
- self.settings["chroot_path"]+"/etc/make.profile",\
+ self.settings["chroot_path"]+"/etc/portage/make.profile",\
"Error creating profile link",env=self.env)
touch(self.settings["autoresume_path"]+"config_profile_link")
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-05-13 18:10 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-18 22:37 [gentoo-commits] proj/catalyst:catalyst_2 commit in: modules/ Jorge Manuel B. S. Vicetto
-- strict thread matches above, loose matches on Subject: below --
2012-05-13 18:10 Jorge Manuel B. S. Vicetto
2012-05-10 16:30 Jorge Manuel B. S. Vicetto
2012-05-06 23:32 Jorge Manuel B. S. Vicetto
2012-05-05 19:14 Jorge Manuel B. S. Vicetto
2012-04-18 22:37 Jorge Manuel B. S. Vicetto
2011-11-06 4:01 Jorge Manuel B. S. Vicetto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox