From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1598106-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 640D815815E
for <garchives@archives.gentoo.org>; Tue, 6 Feb 2024 22:49:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AAA6BE2A36;
Tue, 6 Feb 2024 22:49:56 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 911E5E2A36
for <gentoo-commits@lists.gentoo.org>; Tue, 6 Feb 2024 22:49:56 +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 CEB15343080
for <gentoo-commits@lists.gentoo.org>; Tue, 6 Feb 2024 22:49:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 73B31ACA
for <gentoo-commits@lists.gentoo.org>; Tue, 6 Feb 2024 22:49:54 +0000 (UTC)
From: "Sam James" <sam@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, "Sam James" <sam@gentoo.org>
Message-ID: <1707259768.e9a7d7be53452e2c0d85579eed3454cedfe28316.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/util-linux/util-linux-2.39.3-r1.ebuild sys-apps/util-linux/util-linux-2.39.3-r2.ebuild sys-apps/util-linux/util-linux-9999.ebuild
X-VCS-Directories: sys-apps/util-linux/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: e9a7d7be53452e2c0d85579eed3454cedfe28316
X-VCS-Branch: master
Date: Tue, 6 Feb 2024 22:49:54 +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: 3136e6c2-8bea-4768-a77b-b52af42878e1
X-Archives-Hash: 7d002702b72c656834dd7ad67f199806
commit: e9a7d7be53452e2c0d85579eed3454cedfe28316
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 6 05:03:51 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 22:49:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a7d7be
sys-apps/util-linux: remove usr-ldscript support
Per news item 2024-01-05-usr-initramfs, we no longer support this use
case. It is fragile and hacky and leads to bizarre forms of load errors.
The functionality is, despite being called "split-usr", not really about
split-usr at all.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{util-linux-2.39.3-r1.ebuild => util-linux-2.39.3-r2.ebuild} | 7 +------
sys-apps/util-linux/util-linux-9999.ebuild | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
similarity index 98%
rename from sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
rename to sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
index 6d2aa61d4365..bea51fe15f33 100644
--- a/sys-apps/util-linux/util-linux-2.39.3-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.39.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-r1 multilib-minimal multiprocessing systemd
MY_PV="${PV/_/-}"
@@ -356,11 +356,6 @@ multilib_src_install() {
# This needs to be called AFTER python_install call, bug #689190
emake DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- # Need the libs in /
- gen_usr_ldscript -a blkid fdisk mount smartcols uuid
- fi
}
multilib_src_install_all() {
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index d7b81f31df52..ad0a0bbd4117 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
+inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
pam python-r1 multilib-minimal multiprocessing systemd
MY_PV="${PV/_/-}"
@@ -334,11 +334,6 @@ multilib_src_install() {
# This needs to be called AFTER python_install call, bug #689190
emake DESTDIR="${D}" install
-
- if multilib_is_native_abi ; then
- # Need the libs in /
- gen_usr_ldscript -a blkid fdisk mount smartcols uuid
- fi
}
multilib_src_install_all() {