Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
Date: Thu, 23 Aug 2012 05:56:43
Message-Id: 1345517230.59295a79a91f6a6c27a6363f0d11ee1d24bcb938.jmbsvicetto@gentoo
1 commit: 59295a79a91f6a6c27a6363f0d11ee1d24bcb938
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 21 02:47:10 2012 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 21 02:47:10 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=59295a79
7
8 Create /etc/portage on stage1-controller.
9 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.
10
11 ---
12 targets/stage1/stage1-controller.sh | 9 ++++-----
13 1 files changed, 4 insertions(+), 5 deletions(-)
14
15 diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
16 index 3c348ce..70a6634 100644
17 --- a/targets/stage1/stage1-controller.sh
18 +++ b/targets/stage1/stage1-controller.sh
19 @@ -7,14 +7,13 @@ case $1 in
20 ;;
21 run)
22 cp ${clst_sharedir}/targets/stage1/build.py ${clst_chroot_path}/tmp
23 -
24 +
25 # Setup "ROOT in chroot" dir
26 install -d ${clst_chroot_path}/${clst_root_path}/etc
27 -
28 + install -d ${clst_chroot_path}/${clst_root_path}/etc/portage
29 +
30 # Setup make.conf and make.profile link in "ROOT in chroot":
31 - copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc
32 - copy_to_chroot ${clst_chroot_path}/etc/portage/make.profile \
33 - /${clst_root_path}/etc
34 + copy_to_chroot ${clst_chroot_path}/etc/portage/make.conf /${clst_root_path}/etc/portage
35
36 # Enter chroot, execute our build script
37 exec_in_chroot \