mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-01-19 06:32:15 +01:00
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
|
|
index c4ef239..6415381 100644
|
|
--- a/modules/generic_stage_target.py
|
|
+++ b/modules/generic_stage_target.py
|
|
@@ -813,9 +813,8 @@ class generic_stage_target(generic_target):
|
|
cmd("rm -f "+self.settings["chroot_path"]+"/etc/portage/make.profile",\
|
|
"Error zapping profile link",env=self.env)
|
|
cmd("mkdir -p "+self.settings["chroot_path"]+"/etc/portage/")
|
|
- cmd("ln -sf ../../usr/portage/profiles/"+\
|
|
+ cmd("eselect set "+\
|
|
self.settings["target_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-controller.sh b/targets/stage1/stage1-controller.sh
|
|
index 3c348ce..b481605 100644
|
|
--- a/targets/stage1/stage1-controller.sh
|
|
+++ b/targets/stage1/stage1-controller.sh
|
|
@@ -7,14 +7,14 @@ case $1 in
|
|
;;
|
|
run)
|
|
cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
|
|
-
|
|
+
|
|
# Setup "ROOT in chroot" dir
|
|
- install -d ${clst_chroot_path}/${clst_root_path}/etc
|
|
-
|
|
+ install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
|
|
+
|
|
# Setup make.conf and make.profile link in "ROOT in chroot":
|
|
- copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc
|
|
+ copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/profile
|
|
copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
|
|
- /${clst_root_path}/etc
|
|
+ /${clst_root_path}/etc/profile
|
|
|
|
# Enter chroot, execute our build script
|
|
exec_in_chroot \
|