From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- sys-fs/btrfs-progs/Manifest | 5 +- sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild | 136 +++++++++++++++++++++ sys-fs/btrfs-progs/btrfs-progs-9999.ebuild | 16 ++- .../files/5.16-linux-headers-before-5.11.patch | 40 ++++++ 4 files changed, 190 insertions(+), 7 deletions(-) create mode 100644 sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild create mode 100644 sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch (limited to 'sys-fs/btrfs-progs') diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index 272dbc65851a..0cec5da59518 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -1,12 +1,15 @@ AUX 5.15-filesystem-usage-chunks.patch 2797 BLAKE2B f9f0c709fcef2aa33ba404b14f8b68f8a46d07df489d05a5979c662ea20d7dc0dd7d2c39d305b513a85eaa296061f455fa33b6cce9afbd704077f385c3772e0f SHA512 9dfff219943e7d223795e24aeaf9c3f82a1530b5fe7a7b74df27176e3e52f8a3ee30af74f9b1f59689cd0e5acf274b5eeb2e2c14d0d49e23e716fd7042a5beba AUX 5.15-filesystem-usage-data.patch 1381 BLAKE2B cf9f6b87eb75f61ce79441227d7a55e0b3b2e4317a244469f8d1e0d92e1c06b5aebeb867d2d032c5230a47a7737b1d06c58a9d753c1dc0f0537f713ae51c16e6 SHA512 f0216410964f9d15a74fa787ee01c5b7ddd6266626bbeac6e6560cdac7043c5b091dbaf054e4112639d2819744b02fd51a95ac6394702ec1602a49e29c653588 +AUX 5.16-linux-headers-before-5.11.patch 1545 BLAKE2B 2e0f333d8ba42a45cde8089070e7c020d34ccff0ceb80d9ef9caf0db46a9021e61fa97013960d21c3a74a4e5ea6542571f4ab2ac87d67486bab4d4a785420986 SHA512 62b816a18a73efca0886a8a7bf817e672d99475d279ef060cb89617d54975122aaa67e618635b759132d63541dfdccebca01067650e925723d7730a444de4397 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549 DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c2795d885f91fb44c9c5cf9c735c0c6c0f319e701ca2f6bf19191c50552459287042b56d4308fcc2da5bd566e63c755941 SHA512 5fc182c490733cbe7f2cdb8e131e0c79e5cc374ae32427d5f9ee2251e00e6e1d8ba0fdbbe31d50230f2bded08a9b9c652a4288998a427643a2d738f57ce72f90 +DIST btrfs-progs-v5.16.tar.xz 2327376 BLAKE2B 3bb3b630d465068373bf39776389f733e734cb39801b389a4e94ba2bb325e9625e2cd767c783e4a05e1e18fed92c06190c5d3fbb476b57689a16482357c86b61 SHA512 3ba557134b19f1abb6c63bf3e2092852f92e988677c4bcf9421c824824b87565ae5cc0e5bca0370be81766a8c8fbda21dfb443dcd159f705f31e70b6bf19aa63 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7 EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 EBUILD btrfs-progs-5.15-r1.ebuild 3183 BLAKE2B fc00b7541d5f2e34cb7934e689ad07f6acc9a1543dfe9f236bb34e216f2afcb8cb38660ccf0804ffc9f2e558ab5a761945dbe16a9d2241f2941f5a38cfb39016 SHA512 523711eeec516e8d2c2e10b79c8cc2c10b5a06e730338e2a2176e0ac8de82c625dfbe19985c8cc81d8a0c46ae11425fb86082d826de9cb977d435795918c0705 EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922 -EBUILD btrfs-progs-9999.ebuild 3021 BLAKE2B a03f82d5b530ecb4bcf5e45302972642433df567f4dd225c49f8a9f8baf1399d331f2bec47587d5d23cb377d397e2a1d341fa383e79cd356f6ff0beaa08b7041 SHA512 6385e0f36d35064bcb04e42a261013b680a788ad9835b1aea4f410357865ec5d39bc3bfb9f99a50a2454a1233a7bd0361f85730949dd653698be6c239bced218 +EBUILD btrfs-progs-5.16.ebuild 3090 BLAKE2B 210cf293d434288818fcd88116ddc2ece4254ab6b6f0d027d0f7e5d777448ae01fe81dd5b1cb31a6690bd6909a29a763d573a49c5ebdca191ebbb7ea84bf986b SHA512 5d2b24a3b9878ac6b51d7f84f6630357f56e6b42f27ef8877df953778fef28ebd6aa693023bfdb1bbfbf1f3146dc13b3c52a9763612138e79140a3288bd0bbc9 +EBUILD btrfs-progs-9999.ebuild 3025 BLAKE2B b79d991e41133ea913d3528d06cdbcc4e4aa93a6f7b21a67442c120ee6fd08e574f0a6728a6b1d78e0547338156747daa5815cb1b67c289c4046823ee213833c SHA512 72c910f37f3d3d8446009af6017ddd70f328ac16ae8d3295af8270cf758598317dc0dc60682761045f2fe44374de8fd9b6e9de445191e82729d4965403cef370 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild new file mode 100644 index 000000000000..015b81367170 --- /dev/null +++ b/sys-fs/btrfs-progs/btrfs-progs-5.16.ebuild @@ -0,0 +1,136 @@ +# Copyright 2008-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit bash-completion-r1 python-single-r1 + +libbtrfs_soname=0 + +if [[ ${PV} != 9999 ]]; then + MY_PV="v${PV/_/-}" + [[ "${PV}" = *_rc* ]] || \ + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" + S="${WORKDIR}/${PN}-${MY_PV}" +else + WANT_LIBTOOL=none + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git" + EGIT_BRANCH="devel" +fi + +DESCRIPTION="Btrfs filesystem utilities" +HOMEPAGE="https://btrfs.wiki.kernel.org" + +LICENSE="GPL-2" +SLOT="0/${libbtrfs_soname}" +IUSE="+convert doc python reiserfs static static-libs +zstd" + +RESTRICT="test" # tries to mount repaired filesystems + +RDEPEND=" + dev-libs/lzo:2= + sys-apps/util-linux:0=[static-libs(+)?] + sys-libs/zlib:0= + convert? ( + sys-fs/e2fsprogs:= + reiserfs? ( + >=sys-fs/reiserfsprogs-3.6.27 + ) + ) + python? ( ${PYTHON_DEPS} ) + zstd? ( app-arch/zstd:0= ) +" +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:0[static-libs(+)] ) + ) +" +BDEPEND=" + doc? ( + || ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor ) + app-text/docbook-xml-dtd:4.5 + app-text/xmlto + ) +" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" sys-devel/gnuconfig" +fi + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +PATCHES=( + "${FILESDIR}"/5.16-linux-headers-before-5.11.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 + $(use_enable convert) + $(use_enable doc documentation) + $(use_enable elibc_glibc backtrace) + $(use_enable python) + $(use_enable static-libs static) + $(use_enable zstd) + --with-convert=ext2$(usex reiserfs ',reiserfs' '') + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 all $(usev static) +} + +src_install() { + local makeargs=( + $(usex python install_python '') + $(usex static install-static '') + ) + + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + + newbashcomp btrfs-completion btrfs + + use python && python_optimize + + # install prebuilt subset of manuals + use doc || doman Documentation/*.[58] +} diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index ffe30a969ded..bfedcff31bd3 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -29,7 +29,7 @@ LICENSE="GPL-2" SLOT="0/${libbtrfs_soname}" IUSE="+convert doc python reiserfs static static-libs +zstd" -RESTRICT=test # tries to mount repared filesystems +RESTRICT="test" # tries to mount repaired filesystems RDEPEND=" dev-libs/lzo:2= @@ -45,7 +45,7 @@ RDEPEND=" zstd? ( app-arch/zstd:0= ) " DEPEND="${RDEPEND} - >=sys-kernel/linux-headers-5.10 + >=sys-kernel/linux-headers-5.11 convert? ( sys-apps/acl ) python? ( $(python_gen_cond_dep ' @@ -74,7 +74,7 @@ BDEPEND=" " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" @@ -91,8 +91,8 @@ src_prepare() { 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 "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die - ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || 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 } @@ -107,6 +107,7 @@ src_configure() { $(use_enable zstd) --with-convert=ext2$(usex reiserfs ',reiserfs' '') ) + econf "${myeconfargs[@]}" } @@ -119,8 +120,11 @@ src_install() { $(usex python install_python '') $(usex static install-static '') ) + emake V=1 DESTDIR="${D}" install "${makeargs[@]}" + newbashcomp btrfs-completion btrfs + use python && python_optimize # install prebuilt subset of manuals diff --git a/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch new file mode 100644 index 000000000000..184656d96d22 --- /dev/null +++ b/sys-fs/btrfs-progs/files/5.16-linux-headers-before-5.11.patch @@ -0,0 +1,40 @@ +https://github.com/kdave/btrfs-progs/commit/b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58.patch +https://bugs.gentoo.org/831817 + +From b0cfe12c4d4b8b4ef335cdf4ddefcbdcd1b70d58 Mon Sep 17 00:00:00 2001 +From: David Sterba +Date: Thu, 13 Jan 2022 14:47:08 +0100 +Subject: [PATCH] btrfs-progs: kerncompat: add local definition for alignment + macros + +There's still problem left with compilation on musl and kernel < 5.11, +because __ALIGN_KERNEL is not defined anymore: + +../bin/ld: kernel-shared/volumes.o: in function `create_chunk': +volumes.c:(.text+0x17f8): undefined reference to `__ALIGN_KERNEL' + +Due to the entangled includes and unconditional definition of +__ALIGN_KERNEL, we can't use #ifdef in kerncompat.h to define it +eventually (as kerncompat.h is the first include). Instead add local +definitions of the macros and rename them to avoid name clashes. + +Pull-request: #433 +Signed-off-by: David Sterba +--- a/kerncompat.h ++++ b/kerncompat.h +@@ -359,7 +359,14 @@ do { \ + + /* Alignment check */ + #define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0) +-#define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ++ ++/* ++ * Alignment, copied and renamed from /usr/include/linux/const.h to work around ++ * issues caused by moving the definition in 5.12 ++ */ ++#define __ALIGN_KERNEL__(x, a) __ALIGN_KERNEL_MASK__(x, (typeof(x))(a) - 1) ++#define __ALIGN_KERNEL_MASK__(x, mask) (((x) + (mask)) & ~(mask)) ++#define ALIGN(x, a) __ALIGN_KERNEL__((x), (a)) + + static inline int is_power_of_2(unsigned long n) + { -- cgit v1.2.3