diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2022-09-26 09:30:25 -0700 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2022-10-13 12:17:10 -0400 |
| commit | 2aceab45a9352f126ce5b7f8b04687fe1c28409d (patch) | |
| tree | e56b5bb1b0f0abc739a9cfd4b84a9a9ce8ce06d1 | |
| parent | arch: Add loong (diff) | |
| download | catalyst-2aceab45a9352f126ce5b7f8b04687fe1c28409d.tar.gz catalyst-2aceab45a9352f126ce5b7f8b04687fe1c28409d.tar.bz2 catalyst-2aceab45a9352f126ce5b7f8b04687fe1c28409d.zip | |
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@gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
| -rwxr-xr-x | targets/stage1/chroot.sh | 4 |
1 files 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 |