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)

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index ec032922746c5d002fbdee82171dd0e886f37064..56b91bd1cc1fc665f6d439b441d4da24751e0cb6 100644 (file)
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -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("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",\
                                "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 79f127fcc320608d13337a50724642007846f245..976515db71d711a97d73aec15697c8df89288444 100644 (file)
--- 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 56258772c87d96f7d916a6695aaf33bb3398aa47..1f72067a56dff04ad3e5330b0501b2c828ab3988 100644 (file)
--- 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