diff options
| author |   Jeremy Olexa <darkside@gentoo.org> | 2011-12-01 04:33:17 +0000 |
|---|---|---|
| committer | Jeremy Olexa <darkside@gentoo.org> | 2011-12-01 04:33:17 +0000 |
| commit | 25a5cd47769cbc21a89eb74bd89ab56d581bbadb (patch) | |
| tree | 9590e6a544c360baafb9ff9f1c0aeb35f4822842 /dev-util | |
| parent | [dev-util/catalyst] avoid sandbox errors (diff) | |
| download | darkside-25a5cd47769cbc21a89eb74bd89ab56d581bbadb.tar.gz darkside-25a5cd47769cbc21a89eb74bd89ab56d581bbadb.tar.bz2 darkside-25a5cd47769cbc21a89eb74bd89ab56d581bbadb.zip | |
[dev-util/catalyst] Try experimental patch for /etc/portage/make.profile
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/catalyst/files/0001-s-etc-portage-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 + |