commit: b62b9e7ca8ec68c3a741690d291546a5949359e8
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 6 05:16:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 22:42:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b62b9e7c
app-arch/xz-utils: 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>
.../xz-utils/{xz-utils-5.4.6.ebuild => xz-utils-5.4.6-r1.ebuild} | 8 +-------
app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild | 8 +-------
app-arch/xz-utils/xz-utils-9999.ebuild | 8 +-------
3 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/app-arch/xz-utils/xz-utils-5.4.6.ebuild
b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
similarity index 97%
rename from app-arch/xz-utils/xz-utils-5.4.6.ebuild
rename to app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
index 10993a19d076..15cea9ec02c1 100644
--- a/app-arch/xz-utils/xz-utils-5.4.6.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.4.6-r1.ebuild
@@ -6,7 +6,7 @@
EAPI=8
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs
toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs
toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
fi
}
-multilib_src_install() {
- default
-
- gen_usr_ldscript -a lzma
-}
-
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
diff --git a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.5.1_alpha.ebuild
@@ -6,7 +6,7 @@
EAPI=8
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs
toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs
toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
fi
}
-multilib_src_install() {
- default
-
- gen_usr_ldscript -a lzma
-}
-
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
diff --git a/app-arch/xz-utils/xz-utils-9999.ebuild
b/app-arch/xz-utils/xz-utils-9999.ebuild
index 1ce7c6d3d900..8283f1a12b3e 100644
--- a/app-arch/xz-utils/xz-utils-9999.ebuild
+++ b/app-arch/xz-utils/xz-utils-9999.ebuild
@@ -6,7 +6,7 @@
EAPI=8
-inherit flag-o-matic libtool multilib multilib-minimal preserve-libs
toolchain-funcs usr-ldscript
+inherit flag-o-matic libtool multilib multilib-minimal preserve-libs
toolchain-funcs
if [[ ${PV} == 9999 ]] ; then
# Per tukaani.org, git.tukaani.org is a mirror of github and
@@ -123,12 +123,6 @@ multilib_src_compile() {
fi
}
-multilib_src_install() {
- default
-
- gen_usr_ldscript -a lzma
-}
-
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
