* [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/
@ 2011-12-01 4:33 Jeremy Olexa
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa @ 2011-12-01 4:33 UTC (permalink / raw
To: gentoo-commits
commit: 25a5cd47769cbc21a89eb74bd89ab56d581bbadb
Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 04:33:17 2011 +0000
Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 04:33:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=25a5cd47
[dev-util/catalyst] Try experimental patch for /etc/portage/make.profile
---
...ge-make.profile-etc-portage-make.profile-.patch | 58 ++++++++++++++++++++
1 files changed, 58 insertions(+), 0 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-portage-make.profile-etc-portage-make.profile-.patch
new file mode 100644
index 0000000..aabb6c3
--- /dev/null
+++ b/dev-util/catalyst/files/0001-s-etc-portage-make.profile-etc-portage-make.profile-.patch
@@ -0,0 +1,58 @@
+From 224beaecc04bc47300bcdb56e8c68d1e75c192ae 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
+
+---
+ modules/generic_stage_target.py | 4 ++--
+ targets/stage1/stage1-chroot.sh | 2 +-
+ targets/stage1/stage1-controller.sh | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
+index 55baea7..e4d7935 100644
+--- a/modules/generic_stage_target.py
++++ b/modules/generic_stage_target.py
+@@ -813,11 +813,11 @@ 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/"+\
+ 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")
+
+diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
+index 79f127f..976515d 100644
+--- a/targets/stage1/stage1-chroot.sh
++++ b/targets/stage1/stage1-chroot.sh
+@@ -14,7 +14,7 @@ if [ -z "${clst_buildpkgs}" ]
+ then
+ echo "Your profile seems to be broken."
+ echo "Could not build a list of build packages."
+- echo "Double check your /etc/make.profile link and the 'packages' files."
++ echo "Double check your /etc/portage/make.profile link and the 'packages' files."
+ exit 1
+ fi
+
+diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
+index 5625877..1f72067 100644
+--- a/targets/stage1/stage1-controller.sh
++++ b/targets/stage1/stage1-controller.sh
+@@ -13,7 +13,7 @@ case $1 in
+
+ # Setup make.conf and make.profile link in "ROOT in chroot":
+ copy_to_chroot ${clst_chroot_path}/etc/make.conf /${clst_root_path}/etc
+- copy_to_chroot ${clst_chroot_path}/etc/make.profile \
++ copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
+ /${clst_root_path}/etc
+
+ # Enter chroot, execute our build script
+--
+1.7.3.4
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/
@ 2011-12-07 15:42 Jeremy Olexa
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa @ 2011-12-07 15:42 UTC (permalink / raw
To: gentoo-commits
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",\
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/
@ 2011-12-07 16:01 Jeremy Olexa
0 siblings, 0 replies; 3+ messages in thread
From: Jeremy Olexa @ 2011-12-07 16:01 UTC (permalink / raw
To: gentoo-commits
commit: bbca16f22b51f5071a14baa0872fe532acb557e3
Author: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 16:01:14 2011 +0000
Commit: Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Wed Dec 7 16:01:14 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/darkside.git;a=commit;h=bbca16f2
from last commit, fix syntax error in patch
---
...profile-etc-portage-make.profile-g-Use-ne.patch | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch b/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
index 30fb65e..64b03e8 100644
--- a/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
+++ b/dev-util/catalyst/files/0001-s-etc-make.profile-etc-portage-make.profile-g-Use-ne.patch
@@ -1,6 +1,6 @@
-From 22bd478b2043379218271e2100029dbfce4c1413 Mon Sep 17 00:00:00 2001
+From a800c2e9ce394b076eb4e15ae1cfa9a197e7aabb Mon Sep 17 00:00:00 2001
From: Jeremy Olexa <darkside@gentoo.org>
-Date: Wed, 7 Dec 2011 15:39:17 +0000
+Date: Wed, 7 Dec 2011 15:58:25 +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
@@ -12,7 +12,7 @@ Take 2, specify target symlink better and create /etc/portage first
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
-index 55baea7..893583f 100644
+index 55baea7..6e0bc33 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -813,11 +813,12 @@ class generic_stage_target(generic_target):
@@ -23,7 +23,7 @@ index 55baea7..893583f 100644
+ 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("mkdir self.settings["chroot_path"]+"/etc/portage/"")
++ 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",\
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-12-07 16:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-07 15:42 [gentoo-commits] dev/darkside:master commit in: dev-util/catalyst/files/ Jeremy Olexa
-- strict thread matches above, loose matches on Subject: below --
2011-12-07 16:01 Jeremy Olexa
2011-12-01 4:33 Jeremy Olexa
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox