From: Jorge Manuel B. S. Vicetto (jmbsvicetto) Date: Sat, 5 May 2012 19:10:44 +0000 (+0000) Subject: Revert 97b38787d5e72ef091e1673ed37131b8ad97d6be (moving make.profile from /etc to... X-Git-Tag: CATALYST-2.0.8.1~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0ff044437195c43685167b0c9054e2ac9ec05a6a;p=catalyst.git Revert 97b38787d5e72ef091e1673ed37131b8ad97d6be (moving make.profile from /etc to /etc/portage) until we document it and make everything work with it. --- diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index 26e16d0e..7a5d0a0a 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")