[gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/

["Jeremy Olexa" <darkside@gentoo.org>]

commit:     91eda1bd9d45a7f7491f5004e593896d1844e641
Author:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  7 15:42:20 2011 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Wed Dec  7 15:42:20 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=91eda1bd

[dev-util/catalyst] Try experimental patch for /etc/portage/make.profile, take 2

---
 ...rofile-etc-portage-make.profile-g-Use-ne.patch} |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev-util/catalyst/files/0001-s-etc-portage-make.profile-etc-portage-make.profile-.patch b/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
similarity index 76%
rename from dev-util/catalyst/files/0001-s-etc-portage-make.profile-etc-portage-make.profile-.patch
rename to dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
index aabb6c3..30fb65e 100644
--- a/dev-util/catalyst/files/0001-s-etc-portage-make.profile-etc-portage-make.profile-.patch
+++ b/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
@@ -1,26 +1,30 @@
-From 224beaecc04bc47300bcdb56e8c68d1e75c192ae Mon Sep 17 00:00:00 2001
+From 22bd478b2043379218271e2100029dbfce4c1413 Mon Sep 17 00:00:00 2001
 From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 30 Nov 2011 22:29:57 -0600
-Subject: [PATCH] 's:/etc/portage/make.profile:/etc/portage/make.profile:g - Use new location
+Date: Wed, 7 Dec 2011 15:39:17 +0000
+Subject: [PATCH] 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)
 ---
- modules/generic_stage_target.py     |    4 ++--
+ modules/generic_stage_target.py     |    7 ++++---
  targets/stage1/stage1-chroot.sh     |    2 +-
  targets/stage1/stage1-controller.sh |    2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
+ 3 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
-index 55baea7..e4d7935 100644
+index 55baea7..893583f 100644
 --- a/modules/generic_stage_target.py
 +++ b/modules/generic_stage_target.py
-@@ -813,11 +813,11 @@ class generic_stage_target(generic_target):
+@@ -813,11 +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("ln -sf ../usr/portage/profiles/"+\
+-			cmd("ln -sf ../usr/portage/profiles/"+\
++			cmd("mkdir 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",\