From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9A738158041 for ; Sun, 3 Mar 2024 12:45:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C027CE2ADB; Sun, 3 Mar 2024 12:45:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 97D3CE2ADB for ; Sun, 3 Mar 2024 12:45:42 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7C69C34076D for ; Sun, 3 Mar 2024 12:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 954901049 for ; Sun, 3 Mar 2024 12:45:39 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1709469928.b3f0d2b61f770ada1cf16bab5da16923f1a2f7ca.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/releases/23.0/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/releases/23.0/profile.bashrc X-VCS-Directories: profiles/releases/23.0/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: b3f0d2b61f770ada1cf16bab5da16923f1a2f7ca X-VCS-Branch: master Date: Sun, 3 Mar 2024 12:45:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4bc0b382-ae5d-48d0-98ed-afc48db8e31e X-Archives-Hash: 7dbfff4cea38e2eff0591f2afc09021a commit: b3f0d2b61f770ada1cf16bab5da16923f1a2f7ca Author: Andreas K. Hüttel gentoo org> AuthorDate: Sun Mar 3 12:44:45 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Sun Mar 3 12:45:28 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f0d2b6 profiles, 23.0: un-break initial baselayout installation in stage1 Signed-off-by: Andreas K. Hüttel gentoo.org> profiles/releases/23.0/profile.bashrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/profiles/releases/23.0/profile.bashrc b/profiles/releases/23.0/profile.bashrc index 258d9754e5bb..1a09f04d4d3a 100644 --- a/profiles/releases/23.0/profile.bashrc +++ b/profiles/releases/23.0/profile.bashrc @@ -1,4 +1,4 @@ -if [[ "${EBUILD_PHASE}" == "setup" ]] ; then +if [[ "${EBUILD_PHASE}" == "setup" ]] && [[ "${CATEGORY}/${PN}" != "sys-apps/baselayout" ]] ; then if [[ ! -h "${EROOT%/}/bin" ]] && [[ "${PROFILE_23_USRTYPE}" != "split-usr" ]] ; then eerror "" eerror "Your profile is of type merged-usr, but your directories"