| 1 |
commit: 25a5cd47769cbc21a89eb74bd89ab56d581bbadb |
| 2 |
Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 1 04:33:17 2011 +0000 |
| 4 |
Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 1 04:33:17 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=25a5cd47 |
| 7 |
|
| 8 |
[dev-util/catalyst] Try experimental patch for /etc/portage/make.profile |
| 9 |
|
| 10 |
--- |
| 11 |
...ge-make.profile-etc-portage-make.profile-.patch | 58 ++++++++++++++++++++ |
| 12 |
1 files changed, 58 insertions(+), 0 deletions(-) |
| 13 |
|
| 14 |
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-portage-make.profile-etc-portage-make.profile-.patch |
| 15 |
new file mode 100644 |
| 16 |
index 0000000..aabb6c3 |
| 17 |
--- /dev/null |
| 18 |
+++ b/dev-util/catalyst/files/0001-s-etc-portage-make.profile-etc-portage-make.profile-.patch |
| 19 |
@@ -0,0 +1,58 @@ |
| 20 |
+From 224beaecc04bc47300bcdb56e8c68d1e75c192ae Mon Sep 17 00:00:00 2001 |
| 21 |
+From: Jeremy Olexa <darkside@g.o> |
| 22 |
+Date: Wed, 30 Nov 2011 22:29:57 -0600 |
| 23 |
+Subject: [PATCH] 's:/etc/portage/make.profile:/etc/portage/make.profile:g - Use new location |
| 24 |
+ |
| 25 |
+--- |
| 26 |
+ modules/generic_stage_target.py | 4 ++-- |
| 27 |
+ targets/stage1/stage1-chroot.sh | 2 +- |
| 28 |
+ targets/stage1/stage1-controller.sh | 2 +- |
| 29 |
+ 3 files changed, 4 insertions(+), 4 deletions(-) |
| 30 |
+ |
| 31 |
+diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 32 |
+index 55baea7..e4d7935 100644 |
| 33 |
+--- a/modules/generic_stage_target.py |
| 34 |
++++ b/modules/generic_stage_target.py |
| 35 |
+@@ -813,11 +813,11 @@ class generic_stage_target(generic_target): |
| 36 |
+ # TODO: zmedico and I discussed making this a directory and pushing |
| 37 |
+ # in a parent file, as well as other user-specified configuration. |
| 38 |
+ print "Configuring profile link..." |
| 39 |
+- cmd("rm -f "+self.settings["chroot_path"]+"/etc/make.profile",\ |
| 40 |
++ cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\ |
| 41 |
+ "Error zapping profile link",env=self.env) |
| 42 |
+ cmd("ln -sf ../usr/portage/profiles/"+\ |
| 43 |
+ self.settings["target_profile"]+" "+\ |
| 44 |
+- self.settings["chroot_path"]+"/etc/make.profile",\ |
| 45 |
++ self.settings["chroot_path"]+"/etc/portage/make.profile",\ |
| 46 |
+ "Error creating profile link",env=self.env) |
| 47 |
+ touch(self.settings["autoresume_path"]+"config_profile_link") |
| 48 |
+ |
| 49 |
+diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh |
| 50 |
+index 79f127f..976515d 100644 |
| 51 |
+--- a/targets/stage1/stage1-chroot.sh |
| 52 |
++++ b/targets/stage1/stage1-chroot.sh |
| 53 |
+@@ -14,7 +14,7 @@ if [ -z "${clst_buildpkgs}" ] |
| 54 |
+ then |
| 55 |
+ echo "Your profile seems to be broken." |
| 56 |
+ echo "Could not build a list of build packages." |
| 57 |
+- echo "Double check your /etc/make.profile link and the 'packages' files." |
| 58 |
++ echo "Double check your /etc/portage/make.profile link and the 'packages' files." |
| 59 |
+ exit 1 |
| 60 |
+ fi |
| 61 |
+ |
| 62 |
+diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh |
| 63 |
+index 5625877..1f72067 100644 |
| 64 |
+--- a/targets/stage1/stage1-controller.sh |
| 65 |
++++ b/targets/stage1/stage1-controller.sh |
| 66 |
+@@ -13,7 +13,7 @@ case $1 in |
| 67 |
+ |
| 68 |
+ # Setup make.conf and make.profile link in "ROOT in chroot": |
| 69 |
+ copy_to_chroot ${clst_chroot_path}/etc/make.conf /${clst_root_path}/etc |
| 70 |
+- copy_to_chroot ${clst_chroot_path}/etc/make.profile \ |
| 71 |
++ copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \ |
| 72 |
+ /${clst_root_path}/etc |
| 73 |
+ |
| 74 |
+ # Enter chroot, execute our build script |
| 75 |
+-- |
| 76 |
+1.7.3.4 |
| 77 |
+ |
Archives