[gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/

["Matt Turner" <mattst88@gentoo.org>]

commit:     2aceab45a9352f126ce5b7f8b04687fe1c28409d
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 16:30:25 2022 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 13 16:17:10 2022 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2aceab45

targets: build initial baselayout with USE=build

current flow is the following:
update seed
install baselayout with USE=-build (for reasons unknown)
install @system with USE=build

this leads to a problem on usrmerged systems, because
baselayout with USE=-build that's installed initially does not create
usrmerge symlinks at all, so /bin /sbin are missing.

anything that installs files to those locations will be lost.

after installing baselayout initially with USE=-build --nodeps
we install the following
bzip2
gzip
tar
xz-utils
baselayout[build]

so everything installed before line above ^ loses / files completely.

This commit will change initial baselayout to USE=build

Closes: https://github.com/gentoo/catalyst/pull/10
Thanks-to: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/stage1/chroot.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
index 08b9da46..e0587b59 100755
--- a/targets/stage1/chroot.sh
+++ b/targets/stage1/chroot.sh
@@ -61,9 +61,9 @@ mkdir -p "$ROOT"
 
 ## START BUILD
 # First, we drop in a known-good baselayout
-[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
+[ -e ${clst_make_conf} ] && echo "USE=\"${USE} build\"" >> ${clst_make_conf}
 run_merge --oneshot --nodeps sys-apps/baselayout
-sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}
+sed -i "/USE=\"${USE} build\"/d" ${clst_make_conf}
 
 echo "$locales" > /etc/locale.gen
 for etc in /etc "$ROOT"/etc; do