From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1458543-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id C0C77158020
for <garchives@archives.gentoo.org>; Sun, 20 Nov 2022 00:21:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3D9F0E0A88;
Sun, 20 Nov 2022 00:21:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 2377EE0A88
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Nov 2022 00:21:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BD899341248
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Nov 2022 00:21:29 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 10535766
for <gentoo-commits@lists.gentoo.org>; Sun, 20 Nov 2022 00:21:27 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1665677830.2aceab45a9352f126ce5b7f8b04687fe1c28409d.mattst88@gentoo>
Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/
X-VCS-Repository: proj/catalyst
X-VCS-Files: targets/stage1/chroot.sh
X-VCS-Directories: targets/stage1/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 2aceab45a9352f126ce5b7f8b04687fe1c28409d
X-VCS-Branch: wip/mattst88
Date: Sun, 20 Nov 2022 00:21:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 5bcbaa19-5368-464b-b017-fbe844813d78
X-Archives-Hash: 265ac190261c9a652a59ed6df4192e60
Message-ID: <20221120002127.RjSAyzi9Kq2nueyUNWaE0l1UILLzn5zOhw-HuEirM4Y@z>
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