From 74e7e577af04c7277f00c6a486c1be61cb2df3df Mon Sep 17 00:00:00 2001 From: Sam James Date: Fri, 3 Nov 2023 17:48:53 +0000 Subject: sys-fs/btrfs-progs: drop 6.5 Signed-off-by: Sam James --- sys-fs/btrfs-progs/Manifest | 1 - sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild | 165 --------------------- ...6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch | 44 ------ 3 files changed, 210 deletions(-) delete mode 100644 sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild delete mode 100644 sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index a7e186edc5e8..8a002ef9f1bc 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -2,5 +2,4 @@ DIST btrfs-progs-v6.3.3.tar.xz 3163112 BLAKE2B 76714da94e1cd733df4198b736c31b32d DIST btrfs-progs-v6.5.1.tar.xz 3179504 BLAKE2B 95d424342dfa238ed4dd525f72618b449e91db198fa6a12bcbb6bb48246d7b5b84a8fd5dc3b943246732fa40c3b575855c966f8ca135b32aa926e0709549cb99 SHA512 87cc81ecad0cb22de3086fef0fd825be101344d44dc954ac05e25d394421ca5fe3dbcb27c79a3a8fb67a2d3237b7bd84329ccef2c070b1b07d1156dc08716dfb DIST btrfs-progs-v6.5.2.tar.xz 3190068 BLAKE2B 74010ed51e211d28ce161db9f6e005bb1c73d8726c9a74446520a46bfa8d6f25d267f747e392f82a8ebeb0b9dd25b3681e9617048e33b9244047089a36fc34c6 SHA512 40b5a2f4d4dcf1810eeb0808e6cb72081ef5743a5072b75e2535420b6acb3a3ead61b01da3217c2bc3fb6ec700f141d4646389cc7a6476ce8af51a424a732672 DIST btrfs-progs-v6.5.3.tar.xz 2542416 BLAKE2B 83a39e1a991ad253a8733235c01fed32c23bde033b7ddc647347dba54a9ba5755d8508e6df817a627d59cefbed6a5696ec485093509ab007374d27c739dabfb1 SHA512 6bec6c0da0b61eb4dce6dc3128fe34fdc68b18cbbb7917c3cd13a558cee9464e6b4c1fcda2cab342d1b506767fab4eee5d03d2fb284a5c7249eec5a75407034a -DIST btrfs-progs-v6.5.tar.xz 3178048 BLAKE2B 502d8cebab1d35d8d69eb76212476e323d9f19a9d32eb304acaeb1fc27bfff3ca801fcebc4c19ce7db16ed0114b3c794814157075872c2fd1d8b1d32d740e346 SHA512 7e1578b1f82549f77b55341c20a973da52018b1539da46f92e4a9d9804906ce5e00312c8a02a6047373e4435e661b2e5fc18f5dfbf2d0563cdf62c40de6a4436 DIST btrfs-progs-v6.6.tar.xz 2547332 BLAKE2B ade670578958867bc9686a6b6d9665bd609b0335665224a2880811784debb74a820746ae95a7558ca249c8b8afc3ca2664221ef9c5afb6fc1091dd23bbd45067 SHA512 5292c5bbf8fce74fe9529ee99f2340565b1d0c2c9fe48700ddccf7f7165be7cf4467bb9f3f3d70571dfccee6be669235e7ef88b0d248064b78f0c54abf9f7db4 diff --git a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild b/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild deleted file mode 100644 index d34aeab794b1..000000000000 --- a/sys-fs/btrfs-progs/btrfs-progs-6.5.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 2008-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit bash-completion-r1 python-single-r1 udev - -libbtrfs_soname=0 - -if [[ ${PV} != 9999 ]]; then - MY_PV="v${PV/_/-}" - SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" - - if [[ ${PV} != *_rc* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" - fi - - S="${WORKDIR}"/${PN}-${MY_PV} -else - EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" - EGIT_BRANCH="devel" - WANT_LIBTOOL="none" - inherit autotools git-r3 -fi - -DESCRIPTION="Btrfs filesystem utilities" -HOMEPAGE="https://btrfs.readthedocs.io/en/latest/" - -LICENSE="GPL-2" -SLOT="0/${libbtrfs_soname}" -IUSE="+convert python +man reiserfs static static-libs udev +zstd" -# Could support it with just !systemd => eudev, see mdadm, but let's -# see if someone asks for it first. -REQUIRED_USE="static? ( !udev ) python? ( ${PYTHON_REQUIRED_USE} )" - -# Tries to mount repaired filesystems -RESTRICT="test" - -RDEPEND=" - dev-libs/lzo:2= - sys-apps/util-linux:=[static-libs(+)?] - sys-libs/zlib:= - convert? ( - sys-fs/e2fsprogs:= - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27 - ) - ) - python? ( ${PYTHON_DEPS} ) - udev? ( virtual/libudev:= ) - zstd? ( app-arch/zstd:= ) -" -DEPEND=" - ${RDEPEND} - >=sys-kernel/linux-headers-5.10 - convert? ( sys-apps/acl ) - python? ( - $(python_gen_cond_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - ) - static? ( - dev-libs/lzo:2[static-libs(+)] - sys-apps/util-linux:0[static-libs(+)] - sys-libs/zlib:0[static-libs(+)] - convert? ( - sys-fs/e2fsprogs[static-libs(+)] - reiserfs? ( - >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] - ) - ) - zstd? ( app-arch/zstd[static-libs(+)] ) - ) -" -BDEPEND=" - virtual/pkgconfig - man? ( dev-python/sphinx ) -" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+=" sys-devel/gnuconfig" -fi - -PATCHES=( - "${FILESDIR}"/${PN}-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - default - - if [[ ${PV} == 9999 ]]; then - AT_M4DIR="m4" eautoreconf - - mkdir config || die - local automakedir="$(autotools_run_tool --at-output automake --print-libdir)" - [[ -e ${automakedir} ]] || die "Could not locate automake directory" - - ln -s "${automakedir}"/install-sh config/install-sh || die - ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die - fi -} - -src_configure() { - local myeconfargs=( - --bindir="${EPREFIX}"/sbin - - --enable-lzo - --disable-experimental - $(use_enable convert) - $(use_enable man documentation) - $(use_enable elibc_glibc backtrace) - $(use_enable python) - $(use_enable static-libs static) - $(use_enable udev libudev) - $(use_enable zstd) - - # Could support libgcrypt, libsodium, libkcapi - --with-crypto=builtin - --with-convert=ext2$(usex reiserfs ',reiserfs' '') - ) - - econf "${myeconfargs[@]}" -} - -src_compile() { - emake V=1 all $(usev static) -} - -src_test() { - emake -j1 -C tests V=1 test - - if use python ; then - cd libbtrfsutil/python || die - - local -x LD_LIBRARY_PATH="${S}:libbtrfsutil/python:${LD_LIBRARY_PATH}" - ${EPYTHON} -m unittest tests/test_*.py || die "Tests failed with ${EPYTHON}" - fi -} - -src_install() { - local makeargs=( - $(usev python install_python) - $(usev static install-static) - ) - - emake V=1 DESTDIR="${D}" install "${makeargs[@]}" - - newbashcomp btrfs-completion btrfs - - use python && python_optimize -} - -pkg_postinst() { - udev_reload -} - -pkg_postrm() { - udev_reload -} diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch b/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch deleted file mode 100644 index 40a9bbeff8f6..000000000000 --- a/sys-fs/btrfs-progs/files/btrfs-progs-6.5-avoid-textrel-crc32c-pcl-intel-asm_64.patch +++ /dev/null @@ -1,44 +0,0 @@ -See https://github.com/kdave/btrfs-progs/commit/992be8b50a65974e52a484911e72bc5a5e1b412c. - -With binutils-2.41[hardened], one gets: -``` -/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: crypto/crc32c-pcl-intel-asm_64.o: warning: relocation in read-only section `.rodata' -/usr/lib/gcc/x86_64-pc-linux-gnu/13/../../../../x86_64-pc-linux-gnu/bin/ld: read-only segment has dynamic relocations -collect2: error: ld returned 1 exit status -make: *** [Makefile:660: btrfs-map-logical] Error 1 -``` - -But it's a textrel and a warning anyway even without hardened. - -Disable it for now until it gets fixed properly upstream. ---- a/Makefile -+++ b/Makefile -@@ -387,7 +387,7 @@ endif - - ifeq ($(TARGET_CPU),x86_64) - # FIXME: linkage is broken on musl for some reason --ifeq ($(HAVE_GLIBC),1) -+ifeq (0,1) - CRYPTO_OBJECTS += crypto/crc32c-pcl-intel-asm_64.o - ASFLAGS += -fPIC - endif ---- a/crypto/crc32c.c -+++ b/crypto/crc32c.c -@@ -18,7 +18,7 @@ static uint32_t (*crc_function)(uint32_t crc, unsigned char const *data, uint32_ - - #ifdef __x86_64__ - --#ifdef __GLIBC__ -+#if 0 - - /* asmlinkage */ unsigned int crc_pcl(const unsigned char *buffer, int len, unsigned int crc_init); - static unsigned int crc32c_pcl(uint32_t crc, unsigned char const *data, uint32_t len) { -@@ -95,7 +95,7 @@ void crc32c_init_accel(void) - * now. - */ - if (0) { --#ifdef __GLIBC__ -+#if 0 - } else if (cpu_has_feature(CPU_FLAG_SSE42)) { - /* printf("CRC32C: pcl\n"); */ - crc_function = crc32c_pcl; -- cgit v1.2.3-65-gdbad