summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2024-02-06 00:03:51 -0500
committerSam James <sam@gentoo.org>2024-02-06 22:49:28 +0000
commite9a7d7be53452e2c0d85579eed3454cedfe28316 (patch)
treea47f64f75f5030fd7648e5d591c0f30c46b92313 /sys-apps
parentdev-libs/libpcre: do a full autoreconf (diff)
downloadgentoo-e9a7d7be53452e2c0d85579eed3454cedfe28316.tar.gz
gentoo-e9a7d7be53452e2c0d85579eed3454cedfe28316.tar.bz2
gentoo-e9a7d7be53452e2c0d85579eed3454cedfe28316.zip
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@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/util-linux/util-linux-2.39.3-r2.ebuild (renamed from sys-apps/util-linux/util-linux-2.39.3-r1.ebuild)7
-rw-r--r--sys-apps/util-linux/util-linux-9999.ebuild7
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
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() {