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 1DFFB15800F for ; Sun, 29 Jan 2023 00:10:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1297EE0866; Sun, 29 Jan 2023 00:10:21 +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 EA072E0866 for ; Sun, 29 Jan 2023 00:10:20 +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 C94EA340E9C for ; Sun, 29 Jan 2023 00:10:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8C7D385B for ; Sun, 29 Jan 2023 00:10:17 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1674951005.8fcbeac51966b91f9695093e654f0c76055fa635.williamh@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/baselayout/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/baselayout/baselayout-2.13-r1.ebuild X-VCS-Directories: sys-apps/baselayout/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 8fcbeac51966b91f9695093e654f0c76055fa635 X-VCS-Branch: master Date: Sun, 29 Jan 2023 00:10:17 +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: 274b666d-3ac3-4be2-87e0-f9f0f2a6fb08 X-Archives-Hash: 729ae3cc5362438372c1b6b98076e50a commit: 8fcbeac51966b91f9695093e654f0c76055fa635 Author: William Hubbs gentoo org> AuthorDate: Sun Jan 29 00:10:05 2023 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Jan 29 00:10:05 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcbeac5 sys-apps/baselayout: handle /etc/gentoo-release with CONFIG_PROTECT_MASK Signed-off-by: William Hubbs gentoo.org> sys-apps/baselayout/baselayout-2.13-r1.ebuild | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/sys-apps/baselayout/baselayout-2.13-r1.ebuild b/sys-apps/baselayout/baselayout-2.13-r1.ebuild index afc0043d403a..64d8126ed757 100644 --- a/sys-apps/baselayout/baselayout-2.13-r1.ebuild +++ b/sys-apps/baselayout/baselayout-2.13-r1.ebuild @@ -192,11 +192,6 @@ multilib_layout() { } pkg_preinst() { - # This is written in src_install (so it's in CONTENTS), but punt all - # pending updates to avoid user having to do etc-update (and make the - # pkg_postinst logic simpler). - rm -f "${EROOT}"/etc/._cfg????_gentoo-release || die - # We need to install directories and maybe some dev nodes when building # stages, but they cannot be in CONTENTS. # Also, we cannot reference $S as binpkg will break so we do this. @@ -316,12 +311,6 @@ pkg_postinst() { chmod o-rwx "${EROOT}/etc/${x}" || die fi done - - # Take care of the etc-update for the user - if [ -e "${EROOT}"/etc/._cfg0000_gentoo-release ] ; then - mv "${EROOT}"/etc/._cfg0000_gentoo-release "${EROOT}"/etc/gentoo-release || die - fi - # whine about users that lack passwords #193541 if [[ -e "${EROOT}"/etc/shadow ]] ; then local bad_users=$(sed -n '/^[^:]*::/s|^\([^:]*\)::.*|\1|p' "${EROOT}"/etc/shadow)