From: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
Date: Tue, 21 Aug 2012 02:47:10 +0000 (+0000)
Subject: Create /etc/portage on stage1-controller.
X-Git-Tag: Catalyst-2.0.11~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=59295a79a91f6a6c27a6363f0d11ee1d24bcb938;p=catalyst.git

Create /etc/portage on stage1-controller.
Also update the copy of make.conf to use /etc/portage instead of /etc. Stop copying make.profile as it's set by eselect inside the chroot.
---

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3c348ced..70a66347 100644
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -7,14 +7,13 @@ 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.profile \
-			/${clst_root_path}/etc
+		copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
 
 		# Enter chroot, execute our build script
 		exec_in_chroot \