diff options
Diffstat (limited to 'sys-fs')
47 files changed, 409 insertions, 1128 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 184e69fcd616..71b888f6e09d 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest index f6715e3aa5fd..272dbc65851a 100644 --- a/sys-fs/btrfs-progs/Manifest +++ b/sys-fs/btrfs-progs/Manifest @@ -7,6 +7,6 @@ DIST btrfs-progs-v5.15.tar.xz 2275480 BLAKE2B 45fa1e20d14bdd92b1a7761771c7b6c279 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 3015 BLAKE2B 0ee2f0de803c128ed6bcceb449bc612fbab278c02695e3fab18df69f90f17b41b6275f87ddb3a252d363c9dcd7ae29cc9ebfe09fbcfccfadb76ce46442e1449f SHA512 96d76a1973db45a2ce9bb7f1f92b8f95c215542f6b87630065faa9f94b398849c03aeab66ae42d4c86da9059e179688933b8a42cc471b4e4add3d495593f63ff +EBUILD btrfs-progs-5.15.1.ebuild 3019 BLAKE2B 2617d6d8b08f71e28b94243d75b6110a147edca8f73a097a01986c3e9b771a899bd94bef34d1037cd372fb18226e26e8d8a1587aa7dc44799cf19a4b4f1c0c21 SHA512 e2e75f4d2670faff35310a776cc375e64d1a967fb879bc0e37ecb48d13673be6e19da392855ba1d9c6c7ecbef30e887ad951705c986fb71eaf0c1abae6c4e922 EBUILD btrfs-progs-9999.ebuild 3021 BLAKE2B a03f82d5b530ecb4bcf5e45302972642433df567f4dd225c49f8a9f8baf1399d331f2bec47587d5d23cb377d397e2a1d341fa383e79cd356f6ff0beaa08b7041 SHA512 6385e0f36d35064bcb04e42a261013b680a788ad9835b1aea4f410357865ec5d39bc3bfb9f99a50a2454a1233a7bd0361f85730949dd653698be6c239bced218 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild index 1669da04cd9e..64cc91680915 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild @@ -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= @@ -74,7 +74,7 @@ BDEPEND=" " if [[ ${PV} == 9999 ]]; then - DEPEND+=" sys-devel/gnuconfig" + BDEPEND+=" sys-devel/gnuconfig" fi REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index dcab8ead9b93..4d81f250e7f3 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,10 +1,8 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 -AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0 -AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6 -DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d -EBUILD e2fsprogs-1.46.4-r51.ebuild 4919 BLAKE2B aa332a2ab98952e301cf139d489b7421e8254c83b18eb9750fc509283fd62c02c2b9b921ddf592229cd1425d4922ef0c31c37b6964390b7cfbd0d9cc700940ec SHA512 afe69970b8f4b5077ed9ca2ced0d8d6d5d61278dc1bc367a90ccf7323544d39228fbe7ba51e35bcde747c34cd915106f864dacfb4fec91f424167ecc546bd666 -EBUILD e2fsprogs-1.46.4.ebuild 4011 BLAKE2B ed9e1b1ff7116c4a07c650978b42aa43801daaa530c191c2e3ed095d5a0f2938a2c4795b78ecddb577325ca3b125bbf6bcb08fbe4e957bf1bfb30cfcb34e4171 SHA512 26ef3f4a84c8fcb2b7a57b5f1377761cb137ad4c6f491de4579709987a1489ebd9f35d9bc00a2f10514483b3c0b0b605150bd6d836322b1c183cab771a7a3005 +DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa +EBUILD e2fsprogs-1.46.4.ebuild 3435 BLAKE2B dbb124b159cd882564968c664ee91d2c5db14b814e5baba75cb4f923ec041b4826d280c0b7f633dd11c1bfcc92850182ea7aa3ac63a79d76cdba201bff7bbe7e SHA512 c091444159c4795ae180c966de199016b7cf2de484a95f6123ae11070d72aaa05cb523aa4b28536ba975f3c672a430476269a319843c593c567ba06d7de81671 +EBUILD e2fsprogs-1.46.5.ebuild 4179 BLAKE2B 3f7f98a38ff26f2dedf969356f862ef3d8bd15060b05576dd9ffed1234400bda204e7a6e21437cf5891f40c48145609ffbfc280c10ff2f06a3941b5c53b6aa8f SHA512 afc1ecaca6077ae773fd3b8d71907b6d755ce294ad57e7067c9242c5f874a5ea1c2331a31d9c8ac278085efce0850ca69c0351374544d5f9ac77f5c95ea1a9e8 MISC metadata.xml 782 BLAKE2B 6010ef2af50bc0ec4f7511d28e47cd6f0fc76e3ef88afed222f5a6775e3a1ac51940b2272c37713c0f594b10202391073776f1f8330bc9f45ce0c3a03548f135 SHA512 3a18335967f411f387ecdd066db068d05c90abd1af4a91b226d52a6b9507932528d006ef5e463a423bb635d88b12d81ca1e2d403bd9de2dd12c04a50abc94474 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild index 3c09748eee75..225c1d41eb95 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,13 +7,12 @@ inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" +SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD" +IUSE="cron fuse lto nls static-libs +threads" RDEPEND="~sys-libs/${PN}-libs-${PV} >=sys-apps/util-linux-2.16 @@ -35,10 +34,6 @@ PATCHES=( ) src_prepare() { - if [[ ${CHOST} == *-mint* ]] ; then - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) - fi - default cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" @@ -88,7 +83,7 @@ src_configure() { ) ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}" - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then + if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then eerror "INTL sanity check failed, aborting build." eerror "Please post your ${S}/config.log file as an" eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" @@ -98,12 +93,6 @@ src_configure() { src_compile() { emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . - emake V=1 fsck_ext2fs - fi } src_install() { @@ -128,16 +117,4 @@ src_install() { if ! use static-libs ; then find "${ED}" -name '*.a' -delete || die fi - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi } diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild index c5aa51404248..3e84085d14a9 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4-r51.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -7,17 +7,14 @@ inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" HOMEPAGE="http://e2fsprogs.sourceforge.net/" -SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz - elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )" +SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" -# Unkeyworded for testing unsplitting of e2fsprogs-libs, bug #806875 -#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="cron fuse lto nls static-libs +threads +tools elibc_FreeBSD" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cron fuse lto nls static-libs +threads +tools" -RDEPEND="!sys-libs/com_err - !sys-libs/ss +RDEPEND=" !sys-libs/${PN}-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) @@ -44,10 +41,6 @@ pkg_setup() { } src_prepare() { - if [[ ${CHOST} == *-mint* ]] ; then - PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch ) - fi - default cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes" @@ -99,7 +92,7 @@ multilib_src_configure() { BUILD_LD="$(tc-getBUILD_LD)" \ econf "${myeconfargs[@]}" - if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then + if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then eerror "INTL sanity check failed, aborting build." eerror "Please post your ${S}/config.log file as an" eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096" @@ -119,12 +112,6 @@ multilib_src_compile() { fi emake V=1 - - # Build the FreeBSD helper - if use elibc_FreeBSD ; then - cp "${FILESDIR}"/fsck_ext2fs.c . || die - emake V=1 fsck_ext2fs - fi } multilib_src_test() { @@ -155,12 +142,6 @@ multilib_src_install() { # Move shared libraries to /lib/, install static libraries to # /usr/lib/, and install linker scripts to /usr/lib/. gen_usr_ldscript -a e2p ext2fs - - if use elibc_FreeBSD ; then - # Install helpers for us - into / - dosbin "${S}"/fsck_ext2fs - fi fi gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') @@ -177,15 +158,5 @@ multilib_src_install_all() { if use tools ; then insinto /etc doins "${FILESDIR}"/e2fsck.conf - - if use elibc_FreeBSD ; then - into / - doman "${FILESDIR}"/fsck_ext2fs.8 - - # filefrag is linux only - rm \ - "${ED}"/usr/sbin/filefrag \ - "${ED}"/usr/share/man/man8/filefrag.8 || die - fi fi } diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 b/sys-fs/e2fsprogs/files/fsck_ext2fs.8 deleted file mode 100644 index aa31cf1db172..000000000000 --- a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 +++ /dev/null @@ -1,96 +0,0 @@ -.TH fsck_ext2fs 8 2006-07-02 "Matthias Andree" "FreeBSD Ports" -.\" -.\" fsck_ext2fs.8 - manual page for fsck_ext2fs wrapper -.\" -.\" (C) Copyright 2006 by Matthias Andree <matthias.andree@gmx.de> -.\" -.\" License: This file may be redistributed in accordance with the terms -.\" of the GNU General Public License v2. -.\" -.\" Upstream $Id: fsck_ext2fs.8,v 1.3 2006/07/02 11:45:21 emma Exp $ -.\" $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.8,v 1.1 2006/07/04 15:47:51 leeym Exp $ -.\" -.SH NAME -.B fsck_ext2fs -\- compatibility wrapper for e2fsck -.SH SYNOPSIS -.P -.B fsck_ext2fs -[\fB\-Fpfnyv\fR] [\fB\-b\fR \fIblock\fR] -.SH DESCRIPTION -.P -\fBfsck_ext2fs\fR maps the traditional FreeBSD \fBfsck_ffs\fR options to -options with the same functionality for \fBe2fsck,\fR runs \fBe2fsck\fR -and then maps its exit status to values that FreeBSD understands. -\fBe2fsck\fR is a utility to check and repair ext2 and ext3 file -systems. - -.SH OPTIONS -.IP \fB\-F\fR -(check foreground mode required) Immediately exits with status 1 to tell -\fBfsck\fR that ext2fs cannot be checked in the background. \fBfsck\fR -usually runs \fBfsck_*\fR programs twice, first with \fB\-F\fR to find -out if they can do background checking, then either immediately without -\fB\-F\fR for foreground checking or deferred in the background with -\fB\-B\fR. -.IP \fB\-p\fR -(preen mode) This option suppresses adding the \fB\-f\fR option (unless -\fB\-f\fR is also given) and adds the \fB\-p\fR option to the -\fBe2fsck\fR command line. This causes \fBe2fsck\fR to automatically fix -any filesystem problems that can safely be fixed without operator -intervention. Without this option given, \fBe2fsck\fR will be run with -the \fB\-f\fR option to force a check, since interactive scan and repair -mode is the default on FreeBSD, but not on Linux where \fBe2fsck\fR -comes from. -.IP \fB\-f\fR -(force check) This option forces the check of a clean file system while -preening and is passed to \fBe2fsck\fR verbatim. -.IP \fB\-n\fR -("no" mode) This option causes the file system to be opened in read-only -mode and assume "no" as answer to all questions. This is the only way to -safely run \fBfsck\fR on a mounted ext2 or ext3 file system. This option -is passed to \fBe2fsck\fR verbatim. -.IP \fB\-y\fR -("yes" mode) This option is passed verbatim to \fBe2fsck\fR and causes -it to assume "yes" as answer to all questions. This allows the -non-interactive use of e2fsck but is rather aggressive. Use with care. -.IP \fB\-v\fR -(verbose output) This option is passed verbatim to \fBe2fsck\fR and -causes it to verbosely report its progress. -.IP "\fB\-b\fR \fIblock\fR" -(use alternate super block) This option is passed verbatim to -\fBe2fsck\fR and selects an alternate super block, for use when the -primary super block has been damaged. Please see the \fBe2fsck\fR(8) -manual page for details. - -.SH EXIT STATUS -If errors remain after \fBe2fsck\fR, an invalid option or too many -options have been specified, \fBe2fsck\fR was killed with a signal or -the \fIfork\fB system call failed, \fBfsck_ext2fs\fR exits with status -EXIT_FAILURE (usually 1). If \fBe2fsck\fR cannot be started, exits with -status 127. If the file system is clean after \fBe2fsck\fR operation, -exits with status EXIT_SUCCESS (0). - -.SH NOTES -.P -This utility is merely meant as an adaptor so that \fBe2fsck\fR can be -run during the boot process, it does not support all options that -\fBe2fsck\fR offers. If you need one of its advanced options, please run -\fBe2fsck\fR directly. - -.SH FILES -.TP -.I /sbin/e2fsck -is the location of the \fBe2fsck\fR program to run. - -.SH AUTHOR -.P -Matthias Andree <matthias.andree@gmx.de> wrote the program and this -manual page. -.SH CONFORMING TO -The FreeBSD 6.1 command line interface for \fBfsck_ufs\fR(8). -.SH SEE ALSO -.BR fsck (8), -.BR e2fsck (8) -and -.BR fsck_ufs (8). diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.c b/sys-fs/e2fsprogs/files/fsck_ext2fs.c deleted file mode 100644 index f5e3e5e9a8c9..000000000000 --- a/sys-fs/e2fsprogs/files/fsck_ext2fs.c +++ /dev/null @@ -1,147 +0,0 @@ -/* - * fsck_ext2fs - wrapper for e2fsck on FreeBSD - * Copyright (C) 2004,2006 Matthias Andree <matthias.andree@gmx.de> - * redistributable in accordance with the - * GNU General Public License v2 - * - * $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.c,v 1.5 2006/07/04 15:47:51 leeym Exp $ - * - * Upstream: $Id: fsck_ext2fs.c,v 1.6 2006/07/02 11:37:49 emma Exp $ - * - * format: gindent -kr - */ - -#include <sys/types.h> -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <sys/wait.h> -#include <sys/time.h> -#include <sys/resource.h> -#include <errno.h> - -__attribute__ ((noreturn)) -static int die(const char *tag) -{ - perror(tag); - exit(EXIT_FAILURE); -} - -int main(int argc, char **argv) -{ - int ch, i = 1, force = 0, status, verbose = 0, t; - long block = 0; - enum { normal, preen, yes, no } mode = normal; - char *cmd[256]; - pid_t pid; - - cmd[0] = "/sbin/e2fsck"; - while ((ch = getopt(argc, argv, "BFpfnyb:v")) != -1) { - switch (ch) { - case 'p': - mode = preen; - break; - case 'f': - force = 1; - break; - case 'n': - mode = no; - break; - case 'y': - mode = yes; - break; - case 'b': - block = atol(optarg); - break; - case 'v': - verbose++; - break; - case 'F': - /* e2fsck does not support background checking, - * hence exit with nonzero status to force - * the foreground check. */ - exit(1); - case 'B': - default: - fprintf(stderr, "%s: unknown option -%c\n", - argv[0], optopt); - exit(EXIT_FAILURE); - } - } - - if (force) - cmd[i++] = "-f"; - - switch (mode) { - case normal: - /* FreeBSD needs -f to force a check only in context - * with -p -- so map normal to force to match - * expectations */ - if (!force) - cmd[i++] = "-f"; - break; - case yes: - cmd[i++] = "-y"; - break; - case no: - cmd[i++] = "-n"; - break; - case preen: - cmd[i++] = "-p"; - break; - } - - if (block) { - static char b[30]; - - sprintf(b, "-b %ld", block); - cmd[i++] = b; - } - - /* silently limit verbose to 15 so we don't overflow the cmd array */ - if (verbose > 15) - verbose = 15; - - for (t = verbose; t > 1; t--) - cmd[i++] = "-v"; - - while (optind < argc) { - cmd[i++] = argv[optind++]; - /* sanity check so we don't overflow the cmd buffer */ - if (i+1 == sizeof(cmd)/sizeof(cmd[0])) { - errno = E2BIG; - die(argv[0]); - } - } - - cmd[i++] = 0; - - if (verbose) { - for (i=0; cmd[i]; i++) - fputs(cmd[i], stderr), - fputc(' ', stderr); - fputc('\n', stderr); - } - - pid = fork(); - switch (pid) { - case -1: - /* error */ - die("fork"); - break; - case 0: - /* child */ - (void) execv(cmd[0], cmd); - perror("execve"); - _exit(127); - default: - /* parent */ - if (pid != waitpid(pid, &status, 0)) - die("waitpid"); - if (WIFSIGNALED(status) - || (WIFEXITED(status) && WEXITSTATUS(status) >= 4)) - exit(EXIT_FAILURE); - } - exit(EXIT_SUCCESS); -} diff --git a/sys-fs/fswatch/Manifest b/sys-fs/fswatch/Manifest new file mode 100644 index 000000000000..8de9c755cfaf --- /dev/null +++ b/sys-fs/fswatch/Manifest @@ -0,0 +1,3 @@ +DIST fswatch-1.16.0.tar.gz 844804 BLAKE2B 55527e7d38421f16a9d2c51b5455b73de54220d280233d905a02d192bc374ef91b02c0d68dcd1c1ed6a29351421df0cd0ee9fad50bb98ec9c9018088a6064d4b SHA512 80100b92f5acef503436bbb684f07f5b692099a7eee0970a61c04670de67cd9bfa7942af40b348236dd97fc4d02fcd6a081b96486332efbd06500379c1eff806 +EBUILD fswatch-1.16.0.ebuild 603 BLAKE2B c7c856a4bafb3f92d504b6bea4884895e1c8b6800eafbab8e1cea2ecb03d3b5a5f401ddaf2d815fe6d0ff2dec3fbaf91d2d74692950df55ad140917d7a1ff104 SHA512 7bf6b555a175bdccf126e410ff28028b99ec41b745d547a94dc63cf89fa178cb31d862a641d7fda0222fd006ff5f915520049731a6a1176e726696b3ffcc96b3 +MISC metadata.xml 216 BLAKE2B 921055d990617104de7e3437bc9fd4598cb830193bfcdc34254102a1df2c6025916af7025843f161dff8de731f9726641906b86f831375c5d29303ba64991da2 SHA512 8c43f5f2be76799c8ace4df222de22380c389e058bc7e36bd9b19564cbd4b90ab7515b90f822139a18b3a2cba70e76d3b4eb5426f88a0508798175893073d732 diff --git a/sys-fs/fswatch/fswatch-1.16.0.ebuild b/sys-fs/fswatch/fswatch-1.16.0.ebuild new file mode 100644 index 000000000000..f145c182b0f7 --- /dev/null +++ b/sys-fs/fswatch/fswatch-1.16.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 2021-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="cross-platform file change monitor with multiple backends" +HOMEPAGE="https://github.com/emcrisostomo/fswatch" +SRC_URI="https://github.com/emcrisostomo/${PN}/releases/download/${PV}/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +LICENSE="GPL-3" +SLOT="0" + +IUSE="nls static-libs" + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable static-libs static) \ + CXX=$(tc-getCXX) +} + +src_install() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/sys-fs/fswatch/metadata.xml b/sys-fs/fswatch/metadata.xml new file mode 100644 index 000000000000..91e8ad9f5e33 --- /dev/null +++ b/sys-fs/fswatch/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>ada@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 98a5589f2ed4..8e6de79a9bb9 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -26,6 +26,7 @@ AUX lvm2-2.03.06-example.conf.in.patch 1833 BLAKE2B 21f9d51be4a704417dc35ed7d5ae AUX lvm2-2.03.12-dynamic-static-ldflags.patch 2591 BLAKE2B b1edda6bd715d805ae12967ca453e08859c44f5e48d32e6d264682a6aac6a27fb47aa8fcb36b68b28e3237d76c8b5d060b050736c38d6913a7647b6168a98c3d SHA512 5c9c1d65579a14585c68a348c00b867a48398ebe7a871e6bfcc8cd3a6776c260aa6200f22c108f95ecd65b61ba4b260a5e6acae17dc8c9e639692bbcca2bdf37 AUX lvm2-2.03.12-static-libm.patch 1000 BLAKE2B 4bde7eda80a00f7c692341ebc74ab30308f3157162caba4d789dac42318fd5a16d6b1471463bc2a1f02f50313ce274ecc5aeb039c90e0b979d73146cc9497fba SHA512 cc7764fdaadd767e88d68a3a071f72a7ce30e5bc98fb55b49cf8ba00c3c5a1cac288f2aad0fec94eba5dd2100108756f1315b9704e872d7d64100bbeff1b7a17 AUX lvm2-2.03.12-static-pkgconfig-libs-2.patch 1260 BLAKE2B 3ee43306af649c4d23ac9b096f0649b48f40416a6e77098e449429e6b8a881a23e8e1158be72ab4c2b5d9bf11dda4b983da1b03d13ec614250d530b57d6d8ec1 SHA512 94704e273c82272fcb3e77da66894204f96bfa28343d3f3edc3aa90aeba6334872bace17c57c64cf35114113cd6d20d628702d1516b7c1296f6ceafd75c5c3b6 +AUX lvm2-2.03.14-dm_lvm_rules_no_systemd.patch 1502 BLAKE2B 26cc1f98dd8d286bf74e60ddf02b0658e83a69017743aeaa56ce8a05f6dc03a2322deecaa136713c683882fa85517c9798ce18a2a8de05cd3bbb101cb2ba1c2b SHA512 46bda571f85650d5382f173ad7cce9a055f39e783961bbe8272e2492f4e5ec60f5af231302596a01a4f3ca3cba48b05383a5b0458ab6b85c6d726253f0f45d23 AUX lvm2-2.03.14-static-pkgconfig-libs.patch 4600 BLAKE2B 18fb5d69fb77625189539a64d4189b8ec5bc783ddb10e6e38033633b9a7049203264f0cd7b6c4b6c999c9767130f5da3526a805ffdb187c7aff98de592c11b35 SHA512 c2bc3b7b92bdfed028703a5bb57873c976978a6c84a409098828b96258b0fa349715bd2f140d6d41cbbacbfc34fc7c7901428e21716e04bfbf2d58847653c34e AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc @@ -33,5 +34,5 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d EBUILD lvm2-2.02.188-r2.ebuild 10131 BLAKE2B 1fb4372993e615678e9f5f1a44bcb530ad959ec727a9db5e78bad15bdc32aba31825e75539780987cbede765f16d655d09d1d3cde1e88892fd3b7fa7794056fc SHA512 cb60df19a2ed209c0b47fd50637b1ab18788ac63c865b50e175e6e48b842a8ffa00f53a460305f6554f7a732763c705ba27b1e21e4a2f5a8cb81dbee32946374 -EBUILD lvm2-2.03.14.ebuild 9747 BLAKE2B a9c90de19733d1a904d68c570a5cc4c22b54bd3e73dc08725e4ffe1011c63f6b40ff547d4d4fdcd6c81986dd91dbe1e9e8cdbbee984fd9408c07af3a9cb7e8c4 SHA512 55f39712b2c56425a2d028049e361aa00b42ddb950a826964d74338799b9eeefd5b9a81f0460ae55a9ea94ca5fcf4ee93a22bb98595075fa4036eaa959c7b72d +EBUILD lvm2-2.03.14-r1.ebuild 9914 BLAKE2B b85bb3e1e8b008d5b1c8e8c4224f566cf22d5bd450e96bd1fe8d12b8f1125250c182d229edc3d352ba8e429182f9353402be88fee975da6ccf7c1ad4aa2c7f56 SHA512 4c62c33cc4b447424183a489029c7e04a0f917750a9e0455b22de48cba67ba3461d1394a849b33e6fb1c7b7a290c3cc2cdaef756e07e4bef33c2c653302d61bd MISC metadata.xml 1035 BLAKE2B b9a3162e72e1ea09c7530edca817046434186c3948ef763c1a4efedb45aa8f842b7819efdbb09fb40897368e61b26a43896ef28a4a9d1ae554ea3cdb81f88dc7 SHA512 a16653a343d66eab8bd790eb974cc95d75f48321051ebb37eef87b3c7ad9903b2be1f0c70aff4b711b4469fa2715a5fb0c8566c46e6a83173bf998cf182ce964 diff --git a/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch b/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch new file mode 100644 index 000000000000..0b4a156c630f --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.14-dm_lvm_rules_no_systemd.patch @@ -0,0 +1,37 @@ +From 88d5b3d711c8546864e57dbfba7591a19be80c4d Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Mon, 27 Dec 2021 00:53:21 +0100 +Subject: [PATCH] Don't use systemd-run in 69-dm-lvm.rules + +some people don't run systemd +--- + udev/69-dm-lvm.rules.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in +index 39e5b9807..6ba4efa0f 100644 +--- a/udev/69-dm-lvm.rules.in ++++ b/udev/69-dm-lvm.rules.in +@@ -62,8 +62,8 @@ ENV{SYSTEMD_READY}="1" + # LVM_VG_NAME_COMPLETE='foo' + # + # When the VG is complete it can be activated, so +-# vgchange -aay <vgname> is run. It is run via +-# systemd since it can take longer to run than ++# vgchange -aay <vgname> is run. It can take ++# longer to run than + # udev wants to block when processing rules. + # (if there are hundreds of LVs to activate, + # the vgchange can take many seconds.) +@@ -80,7 +80,7 @@ ENV{SYSTEMD_READY}="1" + # it's better suited to appearing in the journal. + + IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --udevoutput --journal=output $env{DEVNAME}" +-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="/usr/bin/systemd-run -r --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" ++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(LVM_EXEC)/lvm vgchange -aay --nohints $env{LVM_VG_NAME_COMPLETE}" + GOTO="lvm_end" + + LABEL="lvm_end" +-- +2.34.1 + diff --git a/sys-fs/lvm2/lvm2-2.03.14.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild index f27b82cc4ef0..a0f3b38b6ae8 100644 --- a/sys-fs/lvm2/lvm2-2.03.14.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r1.ebuild @@ -99,6 +99,11 @@ pkg_setup() { src_prepare() { default + # Users without systemd get no auto-activation of any logical volume + if ! use systemd ; then + eapply "${FILESDIR}"/${PN}-2.03.14-dm_lvm_rules_no_systemd.patch + fi + sed -i \ -e "1iAR = $(tc-getAR)" \ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest index 66dcb282ae6f..ed7d7174d878 100644 --- a/sys-fs/mdadm/Manifest +++ b/sys-fs/mdadm/Manifest @@ -1,14 +1,16 @@ AUX etc-default-mdadm 320 BLAKE2B 9da106687798a145b523bad7a696b2aa83b16b74f66bd583f9715c78fe3fd8aac9736d4a709128b8ad15660bae514b1a55eccab04e54d869a11cd091cb4dca87 SHA512 2258f6321e447c05e3da88a41c7a2c4a031973744125d00ee0cdb249170b02ff99b58f3883ef6892c882c313fe929404551234c12917a9d7222e497af1cfa48c AUX mdadm-3.4-sysmacros.patch 859 BLAKE2B 7ad91f1bb06ef6ddba5f3d1a4f7c2a542e57c10d0e28d619bd858ea74afdbd1c2f1dc59657f5ceb206c6a9ab93989c29d9b33e7c7394571204786c96ccd16f31 SHA512 47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 +AUX mdadm-4.2-in_initrd-collision.patch 785 BLAKE2B 70767e678b08ff656c6b39915282c0723a0c99ab0712c9ba042d431c38f88158f1b1a064ce6879748cb0088d099a4596ce58bbf8211e0580b7170026a9902e60 SHA512 f891d357f64b9d3c12f6a88174b9889dfbef500920bcaf5a54826aaf507b3824b8b2ac56a7e4870ea73536890e173bb3642c96963a8b3776692552fce14468a8 AUX mdadm.confd 205 BLAKE2B 3ce0a158e1b9621a034442cdc7f643ee39a3cc9ea62697b6d1d090ae28c07e1b2ee192a33bdbdc36b95ec1e997f375764cddfde7e247b0a4830121a5216736ac SHA512 7bf66898000b3d02bbf0704a8032b0f4fc045380501dc8d2bbbb31d33b122d9c35879b25714663079eeadd207c9da87c9d9af8464e76146bf5b68594e73fd92c AUX mdadm.rc 465 BLAKE2B fef5cc1cc68d7d5e11250b6196cfd1fa45bd39e14d90c723d44d7b6e6ee8c3727056eb7f6cd57646f05646798b246aa0579bc61c11cd79c6559cb1070fff7685 SHA512 01fe98e88466afefd84a52cedc5fcbe18eadf8f80fed12b8a2a6a8f5581e7cabe8ce3f2e99cdc3c1bacc626f5eb4f6bffe3cc888153089ee2a461c465ae05570 AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd460e65ef9f35981c05b12f32e96dc0b6a8247e628ff162b0a1171fe00fa55aa3f4dfb47e2fc91a SHA512 3bc7bf8c9593f06e42ae657e2bce416758090d1f999a447986df17b97e1494b261f02155b83932295f2f3bbab7d8933cf647c834bfb1d7def879cbedfaa6d7c2 AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433 -DIST mdadm-4.2-rc3.tar.xz 453332 BLAKE2B 1bab4e8702f1f0a1d2571e90409fcc58c4c7ad4e87cc224b714a842faa454e3a56f9e1852605c8c937a756b55d7dab19ac2bd1e72ce044efec101e526f19f4b1 SHA512 9d544181dca54e2cbdf724b3fab1f840e6a3c523ea0ecd712ef0aad77422a19512e64456adaed6c2e7db2c5dd237a1e7e79cd6202d8dd3d20543019257f39581 +DIST mdadm-4.2.tar.xz 453624 BLAKE2B de7c4318dc5479de41378233869ab84ca2cd0e8a42310157b1acb969e7152af61556fbbe6f17bf6af4dfaf5543e49b1c982d2baeedf1c39b000032f4db7f5502 SHA512 57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63 DIST mdadm_4.2~rc2-7.debian.tar.xz 89904 BLAKE2B dd04f2dd044d0bca85920eaf5c79a288d69c47a7ad7e36509a126c01ef63bd045d7e0530450650028de39d74ad852995ca080c3a73dbcb1cf1b3783118109f35 SHA512 3d36533d2713b663606919b2bfec18b15e18a6a0194e333e38e4a58f175da96af7b1fe16f0c36ee148e14492a4e0710b9fad6ac7856495b63c0176ebb7333be6 EBUILD mdadm-4.1.ebuild 2390 BLAKE2B f087e92607145b9e9235a4da6571d2a691a5f69072cfd40b183422411f4b1c8a41049b8350ff0761c79527afef6ca759e7dcdde42cd7c7bb6620795aef69da7d SHA512 b80d6eec601955155730be28e81fe8b260eeedb3eedc20edd677d5c56fd416ac5b8fac93ecad7047e3e28441437bd3f3b0359de0735933dc9454c31e961d56ea -EBUILD mdadm-4.2_rc3.ebuild 2402 BLAKE2B 43d4ceabc63bd674592f4a1827c62f943d5ddc7db5dc4c37d3f09a6459dd219bd190dc60384a3749e84af85bd4fad1729cf2c2fa133f8d97aaf4cfc8a130659b SHA512 49c6c50b8e5a2c0a8aa9411f6bfca264de4f522dddcc48241a53ae2e839e239c6e86eea23e582564ca6d3aea30019f64a3daa0defb4c77ec904924b554cd918f +EBUILD mdadm-4.2-r1.ebuild 2890 BLAKE2B 047a149bf142139bd87c9d1d4a8814c16e1c924424a24964e895784d2bde0ae5f7a2090f0d936900c485e0bce000bd142df6256ba01ce52b0c58754a49b4d847 SHA512 e39329c3358b3c861d91b46eeebccf3af16f4614557bc2fd48abbd53889c1939deee79506176a8498376e57728f24d421580e6d833d980760e0713a27914c449 +EBUILD mdadm-4.2.ebuild 2402 BLAKE2B d621206ab85486fd0fe5498834b3089a404054741dfc9ad9f089cc6243bc3300597429f9847bfcd6158019ecfcdf148f4b684a07f27863b91327fb8d5ffffa24 SHA512 8e1b50fd67d7d2a7761c2ece15ddc240318b20ebd4ebbb236b6ff78554fc6fac403104177384b681b54108de71771be2bf75ec4304741ce3319ef7765bc42d7f MISC metadata.xml 339 BLAKE2B 68b5c6f497a2396786b76d8cb10a076933ebff54b319ccaba2d8c5af18fb62a56519c5a42b248d7a92624514f3de635be5ff1180ef0b0a7deb8d391324680560 SHA512 3aba8c92057ff5dc92e2a9455f986bea0fcfb84d4c7ecbca2782d983cbd6ca11c1ee4443a217cbaea87d2903659390b04b26adc156782a2672d249254925071b diff --git a/sys-fs/mdadm/files/mdadm-4.2-in_initrd-collision.patch b/sys-fs/mdadm/files/mdadm-4.2-in_initrd-collision.patch new file mode 100644 index 000000000000..689e7d698788 --- /dev/null +++ b/sys-fs/mdadm/files/mdadm-4.2-in_initrd-collision.patch @@ -0,0 +1,36 @@ +Fix collision with libudev symbols when statically linking. + +https://bugs.gentoo.org/830485 +--- a/mdadm.h ++++ b/mdadm.h +@@ -1665,7 +1665,7 @@ + extern void udev_block(char *devnm); + extern void udev_unblock(void); + +-extern int in_initrd(void); ++extern int mdadm_in_initrd(void); + + struct cmap_hooks { + void *cmap_handle; /* corosync lib related */ +--- a/mdmon.c ++++ b/mdmon.c +@@ -309,7 +309,7 @@ + {NULL, 0, NULL, 0} + }; + +- if (in_initrd()) { ++ if (mdadm_in_initrd()) { + /* + * set first char of argv[0] to @. This is used by + * systemd to signal that the task was launched from +--- a/util.c ++++ b/util.c +@@ -2219,7 +2219,7 @@ + return 0; + } + +-int in_initrd(void) ++int mdadm_in_initrd(void) + { + /* This is based on similar function in systemd. */ + struct statfs s; diff --git a/sys-fs/mdadm/mdadm-4.2-r1.ebuild b/sys-fs/mdadm/mdadm-4.2-r1.ebuild new file mode 100644 index 000000000000..aff2ca081cb7 --- /dev/null +++ b/sys-fs/mdadm/mdadm-4.2-r1.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs udev + +DESCRIPTION="Tool for running RAID systems - replacement for the raidtools" +HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/" +DEB_PF="4.2~rc2-7" +SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz + mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +[[ "${PV}" = *_rc* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="static systemd +udev" + +# Only sys-fs/eudev provides static-libs right now, so if you have systemd, +# you need to choose between static or udev, as your udev won't have static libs. +# bug #830485 +REQUIRED_USE="systemd? ( ?? ( static udev ) )" + +BDEPEND="app-arch/xz-utils + virtual/pkgconfig" +DEPEND="udev? ( + static? ( !systemd? ( sys-fs/eudev[static-libs] ) ) + !static? ( virtual/libudev:= ) + )" +RDEPEND=">=sys-apps/util-linux-2.16 + udev? ( !static? ( virtual/libudev:= ) )" + +# The tests edit values in /proc and run tests on software raid devices. +# Thus, they shouldn't be run on systems with active software RAID devices. +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/${PN}"-3.4-sysmacros.patch #580188 + "${FILESDIR}/${PN}"-4.2-in_initrd-collision.patch #830461 +) + +mdadm_emake() { + # We should probably make corosync & libdlm into USE flags. #573782 + local args=( + PKG_CONFIG="$(tc-getPKG_CONFIG)" + CC="$(tc-getCC)" + CWFLAGS="-Wall" + CXFLAGS="${CFLAGS}" + UDEVDIR="$(get_udevdir)" + SYSTEMD_DIR="$(systemd_get_systemunitdir)" + COROSYNC="-DNO_COROSYNC" + DLM="-DNO_DLM" + + # https://bugs.gentoo.org/732276 + STRIP= + + "$@" + ) + emake "${args[@]}" +} + +src_compile() { + use static && append-ldflags -static + + # CPPFLAGS won't work for this + use udev || append-cflags -DNO_LIBUDEV + + mdadm_emake all +} + +src_test() { + mdadm_emake test + + sh ./test || die +} + +src_install() { + mdadm_emake DESTDIR="${D}" install install-systemd + dodoc ChangeLog INSTALL TODO README* ANNOUNCE-* + + insinto /etc + newins mdadm.conf-example mdadm.conf + newinitd "${FILESDIR}"/mdadm.rc mdadm + newconfd "${FILESDIR}"/mdadm.confd mdadm + newinitd "${FILESDIR}"/mdraid.rc mdraid + newconfd "${FILESDIR}"/mdraid.confd mdraid + + # From the Debian patchset + into /usr + dodoc "${WORKDIR}"/debian/README.checkarray + dosbin "${WORKDIR}"/debian/checkarray + insinto /etc/default + newins "${FILESDIR}"/etc-default-mdadm mdadm + + exeinto /etc/cron.weekly + newexe "${FILESDIR}"/mdadm.weekly mdadm +} + +pkg_postinst() { + if ! systemd_is_booted; then + if [[ -z ${REPLACING_VERSIONS} ]] ; then + # Only inform people the first time they install. + elog "If you're not relying on kernel auto-detect of your RAID" + elog "devices, you need to add 'mdraid' to your 'boot' runlevel:" + elog " rc-update add mdraid boot" + fi + fi +} diff --git a/sys-fs/mdadm/mdadm-4.2_rc3.ebuild b/sys-fs/mdadm/mdadm-4.2.ebuild index dc6f83ae0408..645299b2022e 100644 --- a/sys-fs/mdadm/mdadm-4.2_rc3.ebuild +++ b/sys-fs/mdadm/mdadm-4.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/mergerfs-tools/Manifest b/sys-fs/mergerfs-tools/Manifest new file mode 100644 index 000000000000..ac3e124ed5ff --- /dev/null +++ b/sys-fs/mergerfs-tools/Manifest @@ -0,0 +1,3 @@ +DIST mergerfs-tools-0_p20210502.tar.xz 12876 BLAKE2B 760ae2ebb9017e3bb5508d008bc5726cca4ba1930a7f8ebf752e34ed94d92502c146fe2ab25d88c41d27e3ef94b75497b21e0c62c9e86b0e3872916116c4d67d SHA512 8a3c3e92ecdd1c57b8331a0bebfee11908f1d2361fb35cd906173d2d3fd0ce4195eabfb63aa1edac3c36be254504c25edf87caa0608900f6970551991f7a4a50 +EBUILD mergerfs-tools-0_p20210502-r2.ebuild 572 BLAKE2B 5f723e4708ca18a3b4112ad377791eba68267b489b659a06cce2a31e8f16c7376dd0c9814c3f922903353eef379f3b2fe2e9b2ceba14afe36d1f1c95be43c4b4 SHA512 5b7f4e15964c4c42b3e91a18bc23a64a5359d431898d50022661ce614572f92f4c3a6fab45540d7b333ee39228c5ee200b0f313da2f9eac84ea0636507b278de +MISC metadata.xml 341 BLAKE2B d231499cdadc6ccbb88b9bb76a04a7694ee2798954f7b3329d82b719ddcebb4612029f0a9b720a22226ab359ba15bbd243799755e28ac67a48a20e68e8cc2bf3 SHA512 045a57ae6c3a893a4ad7e007b5165ca864a89dae776b67e17c76dad6f3d8ebfe72d616ea990ef1c0ab64555c2e49d5ecfaf393d7d88a353ce3a1e73448b1ddb9 diff --git a/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild new file mode 100644 index 000000000000..6b237738979a --- /dev/null +++ b/sys-fs/mergerfs-tools/mergerfs-tools-0_p20210502-r2.ebuild @@ -0,0 +1,29 @@ +# Copyright 2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit python-any-r1 + +DESCRIPTION="Optional tools to help manage data in a mergerfs pool" +HOMEPAGE="https://github.com/trapexit/mergerfs-tools" +SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz" + +LICENSE="ISC" +SLOT="0" + +KEYWORDS="~amd64 ~x86" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND}" + +src_compile() { + # no build system. + true +} + +src_install() { + emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install +} diff --git a/sys-fs/mergerfs-tools/metadata.xml b/sys-fs/mergerfs-tools/metadata.xml new file mode 100644 index 000000000000..5dd94d2f63a6 --- /dev/null +++ b/sys-fs/mergerfs-tools/metadata.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>slashbeast@gentoo.org</email> + <name>Piotr Karbowski</name> + </maintainer> + <upstream> + <remote-id type="github">trapexit/mergerfs-tools</remote-id> + </upstream> +</pkgmetadata> diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest index 6ba37b62d528..30d69bdadba8 100644 --- a/sys-fs/mergerfs/Manifest +++ b/sys-fs/mergerfs/Manifest @@ -1,13 +1,7 @@ -DIST mergerfs-2.32.1.tar.gz 314392 BLAKE2B 8024dd835af3380fc53ed7255e720c2475da229b2cb3cea68c7bb64edf2b56de903f82c22f65459ea40f08ff724a60fa474a20fbd1e964686a9b1f0df5c5a05d SHA512 2e09ae48d9b06c5a6b7cc577b458a9ec402fcd8243c023f9c03d0b37a35c28722586c738e76f7291559deae84aa69f52bcc76a9042947f984b24b85d84276807 -DIST mergerfs-2.32.2.tar.gz 314267 BLAKE2B 768241671202019262e16ff9e2247014904fdf503057472b8b68805980215c6585a77047b66aa105fc99a83642b104d002808e532445021500ef3da4cdd3a6ae SHA512 f138f53ce9a9fbda6194847e74e3b3b161f49d84bc659f85c56cd61113fb7e5a89a9950eb54537c4a486a57ade5c8644a9809f97bbfff981cff32a6043329a73 DIST mergerfs-2.32.3.tar.gz 314280 BLAKE2B f7c5ab92f1241627bd91255b35bdd81782f153f9144242a52241f9e812e4096c23d73401251a8ace43781f39a4644814dc724a8a31066f77cfd78ad6c27d54dd SHA512 f3f8f320f98ef2a345a0229eca661c6c8c75fdd23613ae0d45f13062b18f6f052474a009c77a6602df77762100f45b3eb76692812e81d12555763ead5c83b87d -DIST mergerfs-2.32.4.tar.gz 314302 BLAKE2B 9435e1e9a7539c5fd732313e269551b12d5e23303e4ac77d783817f42c8004f2873f9e82bd69586c69ebce1e628da707534b04094ea0d7a1f626af6f3b8a444a SHA512 248b5e16c49f0775a5173b10940e45fa401ff81a44e2f081135f118a4deb9f79104d77e1c7424926da703123753a75e8f0590396e44c9ecd3bfdd1f27d7ced17 -DIST mergerfs-2.32.6.tar.gz 314321 BLAKE2B 98d5aba7464a82ca21fd2e5d99bbda9b420462afb0743c132199a5e964143dd2b810fdd556a59b949dcdb8542b83654092e354c3c458bca07e40967c1c484386 SHA512 036c597b33d5ebd5a85444c24ad903f210ee62474ddf226e389bc7366b95972b0f75269540907dc9986c4fa449d0bfc67e6bf225ea1a8023d48872bbd4f5a325 DIST mergerfs-2.33.1.tar.gz 382421 BLAKE2B 0985a0ad53a12fe5283fd0e953cd74a835efd3e83f65ba4e96bc42814ce151d03f95c032eeebcc9821c7c15ae59d14b9e40055438b4482a337c5b7bc9503d27e SHA512 1178fbd4ad99c6c693e2c21551c7522107701b0d5c608a7c18be29825cf97f2a2b2d6a50094e800a74dddd9a3902c374f8b57e84a76c0640aa8e387aa095d300 -EBUILD mergerfs-2.32.1.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd -EBUILD mergerfs-2.32.2.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c +DIST mergerfs-2.33.3.tar.gz 382386 BLAKE2B 49a2b75a2a39fbec178460f94696a918a0f872a7c904355c84180f8be07d9abdf68e342e7acca5093a621b85110d0a0fdb5650de68e04aa176250199eaa5bdb7 SHA512 aca5884a9d5dc03d7095e73461dee843d69463db72dfc033f76611d5417dab63ff29eb2b473f39f0390299c3aa882e6197a7038e82b58ab85799d39cc44b84d0 EBUILD mergerfs-2.32.3.ebuild 1063 BLAKE2B 4ed082d6f17bd69240a60a37e185dbe3c2ffff5dde3abec1c04f6603045c611585fdf8a13d5ffb37c6538bc8a1096c1a6a604528e201653dfadde006f0a59f62 SHA512 68c529bc33c1929e897b0a04e8b6b354abafca9f0d43deb42c443c70938c442b38efab4017969b55918370da71cd35bc75b043e63211e889454a4c44b18936fd -EBUILD mergerfs-2.32.4.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f -EBUILD mergerfs-2.32.6.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f EBUILD mergerfs-2.33.1.ebuild 1072 BLAKE2B 583217f0c3d07e4b2b8ee7b00b81c0bec30e64e73474b6ee8cfa93e6bafc13eb0e0364fc5812c075edc09c31e69861e9251b0fd36c261f352454be026197a634 SHA512 a19d0cbce9402e928aa4193f85232d90572a8e6c05e90a713bdc93641ef0e95c1d36ba9dad8b4181b7fef537c9b9056c5bcee27204d7a911f01abdbfba17bd8f +EBUILD mergerfs-2.33.3.ebuild 1072 BLAKE2B af27c19cfa533b94446585119a7611316c8b06af7dddd9fa8764bd47c4fd0c194a5947dfa68ffb381a99c576408d9c8db40058fe594c2291714329cf904c7923 SHA512 f6de50936deb415446d71f465c1b206f9df246d236c2f45b5fffb8c32dfc7955b2586468cf4848990fe04290668285d266131806dad09615a3eff2658764cf4c MISC metadata.xml 335 BLAKE2B 6650c40b968c0df32e03159d92248d1f54884556cc69175898b149bd2e1dcd7cca5e1d35a3d3478f73fec99ad8d8ea3f5e6873bba6577eb7b78ba1db40e5a295 SHA512 5503d278fe75d307768f01cab25f18452b04c80a954045d8ffc398ff29ff37135009b64401a24f4496da3a098a9e9d46dc430f756f2c020dbe0319fb7ce2b47e diff --git a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild b/sys-fs/mergerfs/mergerfs-2.32.1.ebuild deleted file mode 100644 index 1a8305d70486..000000000000 --- a/sys-fs/mergerfs/mergerfs-2.32.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A featureful union filesystem" -HOMEPAGE="https://github.com/trapexit/mergerfs" - -SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="amd64 x86" - -# Vendorized libfuse that's bundled is under LGPL-2.1. -LICENSE="ISC LGPL-2.1" -SLOT="0" -IUSE="+xattr" - -DEPEND=" - xattr? ( sys-apps/attr ) -" - -RDEPEND="${DEPEND}" - -BDEPEND="sys-devel/gettext" - -src_prepare() { - default - - # Hand made build system at it's finest. - echo -e "#!/bin/sh\ntrue" >tools/update-version || die - echo "#pragma once" >src/version.hpp || die - echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die - - if ! use xattr; then - sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die - fi -} - -src_compile() { - # https://bugs.gentoo.org/725978 - tc-export AR - - default -} - -src_install() { - dobin build/mergerfs - dosym mergerfs /usr/bin/mount.mergerfs - dodoc README.md - doman man/mergerfs.1 -} diff --git a/sys-fs/mergerfs/mergerfs-2.32.2.ebuild b/sys-fs/mergerfs/mergerfs-2.32.2.ebuild deleted file mode 100644 index 5d1e3ec0e4cf..000000000000 --- a/sys-fs/mergerfs/mergerfs-2.32.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A featureful union filesystem" -HOMEPAGE="https://github.com/trapexit/mergerfs" - -SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -# Vendorized libfuse that's bundled is under LGPL-2.1. -LICENSE="ISC LGPL-2.1" -SLOT="0" -IUSE="+xattr" - -DEPEND=" - xattr? ( sys-apps/attr ) -" - -RDEPEND="${DEPEND}" - -BDEPEND="sys-devel/gettext" - -src_prepare() { - default - - # Hand made build system at it's finest. - echo -e "#!/bin/sh\ntrue" >tools/update-version || die - echo "#pragma once" >src/version.hpp || die - echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die - - if ! use xattr; then - sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die - fi -} - -src_compile() { - # https://bugs.gentoo.org/725978 - tc-export AR - - default -} - -src_install() { - dobin build/mergerfs - dosym mergerfs /usr/bin/mount.mergerfs - dodoc README.md - doman man/mergerfs.1 -} diff --git a/sys-fs/mergerfs/mergerfs-2.32.6.ebuild b/sys-fs/mergerfs/mergerfs-2.32.6.ebuild deleted file mode 100644 index 2600359a9c80..000000000000 --- a/sys-fs/mergerfs/mergerfs-2.32.6.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="A featureful union filesystem" -HOMEPAGE="https://github.com/trapexit/mergerfs" - -SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz" -KEYWORDS="~amd64 ~x86" - -# Vendorized libfuse that's bundled is under LGPL-2.1. -LICENSE="ISC LGPL-2.1" -SLOT="0" -IUSE="+xattr" - -DEPEND=" - xattr? ( sys-apps/attr ) -" - -RDEPEND="${DEPEND}" - -BDEPEND="sys-devel/gettext" - -src_prepare() { - default - - # Hand made build system at it's finest. - echo -e "#!/bin/sh\ntrue" >tools/update-version || die - echo "#pragma once" >src/version.hpp || die - echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die - - if ! use xattr; then - sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die - fi -} - -src_compile() { - # https://bugs.gentoo.org/725978 - tc-export AR CC CXX - - default -} - -src_install() { - dobin build/mergerfs - dosym mergerfs /usr/bin/mount.mergerfs - dodoc README.md - doman man/mergerfs.1 -} diff --git a/sys-fs/mergerfs/mergerfs-2.32.4.ebuild b/sys-fs/mergerfs/mergerfs-2.33.3.ebuild index 2600359a9c80..fb2d3b62a41b 100644 --- a/sys-fs/mergerfs/mergerfs-2.32.4.ebuild +++ b/sys-fs/mergerfs/mergerfs-2.33.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest index 480886c33eb7..759f4679452e 100644 --- a/sys-fs/mtools/Manifest +++ b/sys-fs/mtools/Manifest @@ -1,5 +1,5 @@ DIST mtools-4.0.35.tar.bz2 455988 BLAKE2B 9c1ac7f3ad3f9f13a572d0e1ea3c3a9d79bd08f0ae963c7357a19a687b74536cd8442eb167a9e50f7d22398c56736753b0d98bccdaa4c7d8427d1c09e1dd786c SHA512 ef563b3319285667993c82d819e08cb819a6bcd71c466fc252568996b4218cfb3731107ffcd6150ba33c0837e012e02057def41e2b011f751eaf550bfa366a10 DIST mtools-4.0.36.tar.bz2 445920 BLAKE2B 753ee3e412452572b36d15805982255f28bc277764ce66a0fe8483e19a3488fbb282b873a6be85e87e82a71bf7fda517e1234e1911f0b7c3f3992e25f8d18322 SHA512 2425ee0e39c06ea201a5303ab09a0aa9f0c59341522e2c15abc4f079320fd3d67d28afeb2870ee508d472bba6904c542e11c02b92652c8eda1bf338bab372d07 -EBUILD mtools-4.0.35.ebuild 1051 BLAKE2B bbfb5be0365c8e98d06fb0c0e96b775c38b346dacb93c9a7cd467930d6ae7a4212b20b92095629ddc3dd33c9acbd16bbd05bf9e259b3660ec63f67a24dfd6cb5 SHA512 f754225dfa3a840325d80127123b4095a8dd25f76db0c7fb067805ac06e11f25918f55549aae4fcf7ea26d29a66f01c3a5d2dfecc0bf8a9a14ad569f269324cc -EBUILD mtools-4.0.36.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931 +EBUILD mtools-4.0.35.ebuild 1039 BLAKE2B 589196fa40f2b431f37fd57202bcafeff5b9983c39ea7af707657909105e7a45976628db2ff42be2f8636902b6cc20e4d59399063a02eeba7637a25cbbef4e88 SHA512 24d053a6446ab3d1752fd9fd07bc378f0f7e69a596b088a5a690dcb065aaf146e895223ef9141beaa5c3461382ebb94025cb5aa9e653c5da9d9643250d247a05 +EBUILD mtools-4.0.36.ebuild 1046 BLAKE2B 56ef115a96cff7dae2e40d5e5d32b0c175052bd0bb3bb87b136bb47ffd85d965d65ee0f17a21e51ed558eeea073028784b55c3ef21c980a5575d93ac05703840 SHA512 860c7b5189e8794ef1c59096120c387404a5248fed1f304aa6de7c0daf2d4b45ccf9d74734f0881f513f00c023573bcfd45afe90b280695e13309ce54537afe9 MISC metadata.xml 328 BLAKE2B c30c5c458fda474023b5e314ce53311d21a0f15b69463f18a32126f409a034153b8c5b65009584ac0f20666ec9780f7cf518b7207f8550a950dbd2e82da3e138 SHA512 43d7d1e26abf6567746dcab87215aa69faea5308f951348ae82bf9c6bd5e414a69898eb4a23a46ef84ee5be0aab2d019beb8287d2ed2195b6a1b56f25edc2316 diff --git a/sys-fs/mtools/mtools-4.0.35.ebuild b/sys-fs/mtools/mtools-4.0.35.ebuild index 11b85109c45f..74e3d8fd4a01 100644 --- a/sys-fs/mtools/mtools-4.0.35.ebuild +++ b/sys-fs/mtools/mtools-4.0.35.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris" -IUSE="X elibc_glibc" +IUSE="X" RDEPEND=" !elibc_glibc? ( virtual/libiconv ) diff --git a/sys-fs/mtools/mtools-4.0.36.ebuild b/sys-fs/mtools/mtools-4.0.36.ebuild index 3ebdd3b6df91..52f5d5207032 100644 --- a/sys-fs/mtools/mtools-4.0.36.ebuild +++ b/sys-fs/mtools/mtools-4.0.36.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris" -IUSE="X elibc_glibc" +IUSE="X" RDEPEND=" !elibc_glibc? ( virtual/libiconv ) diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest index 0f330da4ed86..16973546503f 100644 --- a/sys-fs/multipath-tools/Manifest +++ b/sys-fs/multipath-tools/Manifest @@ -5,6 +5,9 @@ AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38 DIST multipath-tools-0.8.7.tar.gz 523535 BLAKE2B 3f59af86f5b9f9ea524bf0c36e4a4bc3e01f557f2e18486b5278fe10e3bcf10dbc7568768c0e95529885bcdca6bcf04021ad5261bd1e6a3aeae5eb95b9d54801 SHA512 c01aea837b13429d17688455b813947342ca1cabba19b22e13ce640c77e68335a6d410280a8298595e239131e6fcbb655fa6de5ff9857eac99aa175046a450cd +DIST multipath-tools-0.8.8-no-compress-man-pages.patch.bz2 2493 BLAKE2B 08d77d6524861a590e07e3e9eedb1039c9b15b589becd912f17f37f728a751c7566699540c025aa1f8a0b2e04db551b0093d066f6e340a15309794fdde197483 SHA512 662f32ba5437be2a3cfffc5a466dccb7923668eeef5f23112b31d6c1b43eca2917579729e975cfbe4cd60ecfaf547f534d304626ac19d165bb2f1a3ae4bb1cc6 +DIST multipath-tools-0.8.8.tar.gz 527412 BLAKE2B 15e24a04ff1c41c8562033ca22214c015ab4c4a9e9833323830b665793c1964b6fcb7b710761bf501f0e99d461d6e6c7dfe80851a0ded4d99693a1561490598f SHA512 f09932da93b6ab06f0f911b09c605ea931fb8cb8b5530ef9999d21a41056fb48e944fc245dfe20096b2746ce1c9ebb5b548e1182079a3b52659d33263a441969 EBUILD multipath-tools-0.8.6-r1.ebuild 2138 BLAKE2B e6be272ce638c903e22abe6dddc932b2b52a52293ff2719e4a56dea2d782592ae034171f100379ee0239d7b2e0c8254d02396e50ed0c51d357dfb3118ea21be7 SHA512 66e6adbfbda1b831333a4e2dcd928f78e9aa89aa3415a803c716b9700e8247c822be2094ce5780718da879546738d344b012d4cf495aabf7c885b865367aa805 EBUILD multipath-tools-0.8.7.ebuild 2132 BLAKE2B a42ce3be0b507c66af3690b81593f9d18a5d3a70dc77ee323cf816fce04628b07dd12acd12b624ea7f2fb3d0e7468d80d2ea0c4200dc17b848d5f68333870268 SHA512 3231f180433566de5eff4b7398db745dea00ecee4ca64de35dd5d32921686a4543982068c894c86dcd3741e83488ef6c821461de80f33e32f9fd4f50162c8904 +EBUILD multipath-tools-0.8.8.ebuild 2248 BLAKE2B 234541cfd0620029a6a35dff42454395fb2ce22ca2c53fbd51c85d0c6b225d8d79cf6b5f73f297dcadeb59cbad678356c06787184547e7a28bdb38ad8c712992 SHA512 50cb95b88459cb79a3e0777ee8a7f90e4ad02634ea61432f507064d6b419754c69aa56d4170f4926a3bb9ba9a42082989f4a2473ada9587899b4b1765ce6da88 MISC metadata.xml 453 BLAKE2B 2f2a56731716bfb47dee061219c80834aa382daf9e6ce937cef2237fc1bbb05e988672cc178ad471d68e9ab4f9292677be71ef9198a163f85a7f3b8658f5d698 SHA512 e8df3db70f5d919789ff0512409365fc80dfbb31ede6079c49910e8acffc6b5289290a48acef8230bc59899262801255048d1a730f81c3642945f8c872ac5428 diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild new file mode 100644 index 000000000000..303eac62b7c9 --- /dev/null +++ b/sys-fs/multipath-tools/multipath-tools-0.8.8.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit linux-info systemd toolchain-funcs udev + +DESCRIPTION="Device mapper target autoconfig" +HOMEPAGE="http://christophe.varoqui.free.fr/" +SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.8.8-no-compress-man-pages.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86" +IUSE="systemd rbd test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/json-c:= + dev-libs/libaio + dev-libs/userspace-rcu:= + >=sys-fs/lvm2-2.02.45 + >=virtual/libudev-232-r3 + sys-libs/readline:0= + rbd? ( sys-cluster/ceph ) + systemd? ( sys-apps/systemd ) +" +DEPEND="${RDEPEND} + test? ( dev-util/cmocka )" +BDEPEND="virtual/pkgconfig" + +CONFIG_CHECK="~DM_MULTIPATH" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.7-respect-flags.patch + "${WORKDIR}"/${PN}-0.8.8-no-compress-man-pages.patch +) + +src_prepare() { + default + + # The upstream lacks any way to configure the build at present + # and ceph is a huge dependency, so we're using sed to make it + # optional until the upstream has a proper configure system + if ! use rbd ; then + sed \ + -e "s/libcheckrbd.so/# libcheckrbd.so/" \ + -e "s/-lrados//" \ + -i libmultipath/checkers/Makefile \ + || die + fi +} + +src_compile() { + tc-export CC + + # LIBDM_API_FLUSH involves grepping files in /usr/include, + # so force the test to go the way we want #411337. + emake \ + LIB="${EPREFIX}/$(get_libdir)" \ + LIBDM_API_FLUSH=1 \ + PKGCONFIG="$(tc-getPKG_CONFIG)" +} + +src_install() { + dodir /sbin /usr/share/man/man{3,5,8} + emake \ + DESTDIR="${D}" \ + LIB="${EPREFIX}/$(get_libdir)" \ + RUN=run \ + unitdir="$(systemd_get_systemunitdir)" \ + libudevdir='${prefix}'/"$(get_udevdir)" \ + pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \ + install + + newinitd "${FILESDIR}"/multipathd-r1.rc multipathd + newinitd "${FILESDIR}"/multipath.rc multipath + + einstalldocs + + find "${ED}" -type f -name "*.la" -delete || die +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog "If you need multipath on your system, you must" + elog "add 'multipath' into your boot runlevel!" + fi +} diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest index 3011b2bedef9..1dbc13f4c3b3 100644 --- a/sys-fs/udiskie/Manifest +++ b/sys-fs/udiskie/Manifest @@ -1,5 +1,5 @@ DIST udiskie-2.3.3.tar.gz 92133 BLAKE2B 515673182297f02761f8c354ab9450b04b4533b8165035322c104cbc9aa41da83898dc7e2c371da47dcc8c5dc7ef6adbe5b05f913d77b395d5d8457f9260e845 SHA512 0b0b37dba437fd4af45d0344f36b36ccf0626d18fc29e020270cd567d4912fe1362182a28b55f3dfe1a23922d416cc8d952555e350c7b2d90fb49702dc497ebb DIST udiskie-2.4.0.tar.gz 94008 BLAKE2B 23c062aa79cb2ffd6377f8cdf3eea1c8398b56743054c701e878dd6070bd1ee14e3f1aab9a791d4b6d44b1ddab68cc69f92eb3dd711c9598d3d770d90a43e7d7 SHA512 3f2d3d37996442b21d8c167929eb2e6f2fcb864b313334954407b03d913c83671dd25960226bafc68e463ab0ea38cfb6947467dd8bf51bbee7f072e4bdf19d7a EBUILD udiskie-2.3.3.ebuild 1004 BLAKE2B 9f34d757a24e3b6580e4030ee6c73a49d8a4357121dde2b5368175ebaa560961207a6f81d2cc339a14c41b3ae2dc682ab9e5c88cbc05b5299fb57b5833adf942 SHA512 d51f8e3e5edbf842b2d5ff040d310b9d516eb58be78806c0cb4af7d0ec5258d70d7e66883186b7c4ae6782d61b6589faca23fd190904ddafcbe647f8b7b3f8bc -EBUILD udiskie-2.4.0.ebuild 1051 BLAKE2B 231dd87235f49bf5222ecd9b93ceeceab6d128ea2b1f80278126e70832fb03224d79a662d54b69be17271a26dd2df5b1f9ed275885cec8016aea5abc686c7e46 SHA512 1398fb275131de52120b21a80f75e635b5f26510ba6215a5e9261e44d4d3b2cf19491707a4ec54ff36d86e2a0e7b137ef0074e1cc9c9a0c54133f66cfdc01394 +EBUILD udiskie-2.4.0.ebuild 1049 BLAKE2B 16668aebb7fc9cd178378220cce7db126b949931eda24c4654264a2aa00eb9245186f50278b20a8dbbaad8dbe5e80bf5987dfb0c221db043912af4c8db59a9a6 SHA512 6041ab9ec91a0a05513ec6e9fa3520c80d1c714ed0e8e636b065899ecfb4b45762539120ddf478ffa2506ad0b021394b1d6bf7644965cb999a34bb652cf5534f MISC metadata.xml 370 BLAKE2B d5b749c5ab2cf4ddd7c4df39045f109acaba44b50e8babeae6e3ad31e730a52e52bdce7922780a1f358e1a9e1f11d32882eef0f2ceb20ef04011301b7fd3ff83 SHA512 9fd25405737377b4fe0a38672bb3ec871d6d099dcd8b7cfb0bac631a7407133f5974b4d43751dcc186e48dc27997388da30350608139166351a390bc8d02de39 diff --git a/sys-fs/udiskie/udiskie-2.4.0.ebuild b/sys-fs/udiskie/udiskie-2.4.0.ebuild index b4ee4d3380e7..905bb0bb94be 100644 --- a/sys-fs/udiskie/udiskie-2.4.0.ebuild +++ b/sys-fs/udiskie/udiskie-2.4.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="" RDEPEND="dev-python/docopt[${PYTHON_USEDEP}] diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest index 04976f0be425..7a625a629802 100644 --- a/sys-fs/unionfs-fuse/Manifest +++ b/sys-fs/unionfs-fuse/Manifest @@ -2,5 +2,5 @@ DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12e DIST unionfs-fuse-2.2.tar.gz 47955 BLAKE2B 44ce19b5b857a571da4722af7d19f4c59a5ca222a9d5d544529ef6c4be5125518ffc62cbbd7b5ac7b88fadd22b8777daf18b23124602f35de1a8a041b27d3cbb SHA512 eaecc203f8fad094221cf16b962e7d32a3aa9b0c945a663ce027aba3b7c4152a4dba8d5e96cb63d147f5ecd216cae29b53de946d74a939cde486dcea95d947df EBUILD unionfs-fuse-2.1.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260 EBUILD unionfs-fuse-2.2.ebuild 1006 BLAKE2B e84c1581e028696331f8ee1c09e3a3f3327f23904d70d89527b03f32b5e907b571e52c9a6bfb6867dcf4c3d5ef0c3895ff5f33a75144aa9f66494bbaab3f6dd4 SHA512 211c3161df223f7ca0ec848bbe7a4d7d448480a8c3fa8bf1cb84cdd6e61b3d45f25c55df29eda9eb1530b05690c44c27e321ae3e0a3efbd71779357da8d0b260 -EBUILD unionfs-fuse-9999.ebuild 964 BLAKE2B 16297e64d3137ac4562c1ceece6c341ec31a4b53e6b63ea86b59b4ac4986565051b6b4cc858e309b7f035c0d606ddc0ef7001f89ac3408b1b0ad3dc962090919 SHA512 776252949ac73f675d1935f1c3ea24e5801b55c9a2e80b3084c4a05478ee9656d809f917fca7a80141d50cb8713b4aa0c63a9961c5cbeca6a99806974e3fa9aa +EBUILD unionfs-fuse-9999.ebuild 971 BLAKE2B b52eb0ee84cf11c90138eeeb11ff6aab9498b5b83d6c748e9a294ca87b2027e3bc676d0de97b346ccd3154c8f37c57637302dc7392ec93dd6fb07f1f8e82a2f0 SHA512 35900df2c72a3b225835589f9e096b450ccdb29346931924c78bcd9c8a4aa2ba54166dd1a9b3097a9e313d6e5f7a5fa99d8cd0560265a49422d9cfac1194d959 MISC metadata.xml 337 BLAKE2B 709342431554e98878806adef0d73e755defdf429a6541b42897f35ffab2764fa895365fed84a5c2a8437ddd5c386b4a51809550e1175eae8afae24d225b59cd SHA512 841cf1eae96b3ccafd75a5fbff6d7fba5e32bf9ab11db352f19b37adcfae30ddcaaa094d9bd4f5d10427f2f2d9c62e2c1454c3999141b64fa3df596c726396c7 diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild index c5479601a118..5897a40f2915 100644 --- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild +++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild @@ -4,7 +4,7 @@ EAPI="7" PYTHON_COMPAT=( python3_{7..9} ) -inherit python-any-r1 toolchain-funcs +inherit git-r3 python-any-r1 toolchain-funcs DESCRIPTION="Self-syncing tree-merging file system based on FUSE" HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse" diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest index aece29c1e6f4..e1563f84c31e 100644 --- a/sys-fs/xfsdump/Manifest +++ b/sys-fs/xfsdump/Manifest @@ -4,6 +4,6 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351 -EBUILD xfsdump-3.1.9-r1.ebuild 1618 BLAKE2B 734ce5ddc985969de991b2c7394e93b59e9a02e32492df9b389b8be7e50b3961549980ab553837fa758c138f3456d983e112060b8c403718b78d5e14d68173a0 SHA512 4e718505da2fb99d33b1c7432a89aad2ce1662a3672aa982e31d0cbef8709876aff143a2a2fea22843d85bf9dc4f13ae76e4e5754b7c4bcb412929edbfce7425 -EBUILD xfsdump-3.1.9.ebuild 1627 BLAKE2B a0a8dc7e37a915700699b5db970c755a84fc679ffb327654bbb07592b297740a9fb945062442d439d026e15c82a56423ecfe61c02dea497e59af549e0aa7d83a SHA512 c4de8c287915cc9e6934b8fbafb9ae1ca44a9b8e5cfa81c09defbad9b60facb0fc0344dfc94b49dbceaf6a97e87529821a76e2465f5044c47a91b8d8929f59f7 +EBUILD xfsdump-3.1.9-r1.ebuild 1581 BLAKE2B 0613d92c205bf68359bad98cd4ad56bb0e1c1b6e1996189d85e68b41aebcb73d8643dd9f63ee9c97d6fc7f316a791b44bb74a77a28c7b99875e68ec75dca6a2b SHA512 5ea03e7f5f112ae94578db745372394559a37a7847baeafbd24b687c03568649c1e3c5eb21d03362e17ab161eaa8f068a8c42f5ca9d6539532b649f88a7ab0ec +EBUILD xfsdump-3.1.9.ebuild 1590 BLAKE2B ea9a24f9de2a46bad7f53623e496ab2d7a8c5ffa8ef13d0d3adde7a35d572bd7afd7d8796b8de82697c0c7f05aed0ff4bbe19304f110a4413345b079c2f486de SHA512 06705e20c725ef6239208d08badf6dbc8f3691ac88501b5431179ad6bda7da867f024e0d2555515887166c80fdd491614dce1b391f4129151cd9db6a8ebcbd1a MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild index 9d68ac0a7cd4..500e295dd5f7 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -24,7 +24,6 @@ RDEPEND=" DEPEND="${RDEPEND} nls? ( sys-devel/gettext - elibc_uclibc? ( dev-libs/libintl ) ) " BDEPEND="ncurses? ( virtual/pkgconfig )" diff --git a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild index fd7f18bc427d..f89dc7dcba2b 100644 --- a/sys-fs/xfsdump/xfsdump-3.1.9.ebuild +++ b/sys-fs/xfsdump/xfsdump-3.1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -25,7 +25,6 @@ RDEPEND=" DEPEND="${RDEPEND} nls? ( sys-devel/gettext - elibc_uclibc? ( dev-libs/libintl ) ) " BDEPEND="ncurses? ( virtual/pkgconfig )" diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 7c90596cde85..a4d9367262dd 100644 --- a/sys-fs/xfsprogs/Manifest +++ b/sys-fs/xfsprogs/Manifest @@ -5,5 +5,5 @@ DIST xfsprogs-5.14.1.tar.xz 1308968 BLAKE2B fda20f824a030113717cc46de1920696dc8f DIST xfsprogs-5.14.2.tar.xz 1308912 BLAKE2B 04083bf7952015d64f16e1aec0fa74be1957543e2264914f69defe45a3dc9f2524d941abc064a25a2fd760ebd6dcdcdc2404fd305e08fff7f6be6c5fc11d4d2f SHA512 cb9794247a2eed8bd9f10ff811d38f97e4adbed97bad334b0fa8a26503ec224237eddd92fd78892584a153967417ab2009fb2fc8bab6ef12cd53fd20bdba1b4e EBUILD xfsprogs-5.10.0-r1.ebuild 2259 BLAKE2B 8a3a5d59bb1985b0b6ae1d12a6b4ab4083837ff8931547cabb87acb40574b50786ed1e9c8c7f1a7ce07c235164f670d6a5aef4b336537389951e11628d47deb1 SHA512 6ec3293027fcafe8ae56ad5329a0e617a879ef89cff14d9e2ef306f77443b7f45e4377e1eefdc175078195581d5766324284a737e759ab0db9a6d4bc1a1de431 EBUILD xfsprogs-5.14.1.ebuild 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb -EBUILD xfsprogs-5.14.2.ebuild 2276 BLAKE2B 42259bd5637cd5d24e042c07bcbb1892d7a5719780bf5b4a9622fc7292bf68277f0e514c5fdbb4b01ac8d4d4f881d23b60d5a4b3ea0bd79ec1620a76602e9461 SHA512 2346390ff04bac2a638850af7a86e5070447f0ec220f3de30e53fbca7dbdf28e45cfdb33823dd052f2f7c7798e4a004237e484cdace35a7a5f21dfb97c968b23 +EBUILD xfsprogs-5.14.2.ebuild 2274 BLAKE2B 7c5cd884f8cb6283d7ab70094c0d50ef7eade177ae250110fce0d8180aca1b90d4b540cbdd8fff3f8ee3e8264d836bba5c85eec3878f02fd49f7ea7a36512ac7 SHA512 e90ba8d24e23e3a6ea057e050a1c9cf0426954e335bd95b8b826259ac145e6fd080e0a8fe2f9eb90d6c47c215ac5ef62baf764e9dee6326474220f7aafd5415e MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d diff --git a/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild b/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild index 8f0ddb754f48..0a131b80800d 100644 --- a/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild +++ b/sys-fs/xfsprogs/xfsprogs-5.14.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="icu libedit nls selinux" RDEPEND=">=sys-apps/util-linux-2.17.2 diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 3f8ae68b198f..8d44e0f3232d 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,14 +1,11 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b5ee1062f9260c0418909d380cdd2d637b52d4959ec19cafec1e55b1d05cd6bc358fdffbd6dc1b159e9935083d SHA512 af6b73a2d9d1b4e028c9b959950934798f4d048211d6e4a7e94595982ad2dc8bb4befd52122e3fa0890548e192f2f2ae41d877cad057543e940a7c2710c81a23 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce -DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8 -DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb EBUILD zfs-kmod-0.8.6.ebuild 5746 BLAKE2B b8d5cfa1c83f6ae0b565a0469f0c69def97fd536dc2645b623fe31cd2ca6d802976b3aacd05023ede636abb45c5a968256270809e4c080ace95993d640646f4b SHA512 758cbe8be086ade139b4559684e4cfd6b8b1c61273c88f15b7bb612ae49b89b59f05b8f843a8a4993833406769ca017c582e7dadeef41fc70732bac7d1aa944c -EBUILD zfs-kmod-2.0.6.ebuild 6041 BLAKE2B 023489558d68fce25c41745ffaedc835a4d4148b55c894121e25c6211bc42fe78aca518f4cab72d0f9a9770c62fd00a4076b7098f02169613cf39c4cfc614ca8 SHA512 f6b8e7d0805ebb2cd5ebd69c4fa15ce468a4b353cfd879ef642d3608a96041738ba2a43c9471914e16139ea707609244c68116e0a1d02f5faba6759cfcde8ea1 EBUILD zfs-kmod-2.0.7.ebuild 5624 BLAKE2B ec04bc269acb6ea08e202b2a52e9883bd7b16d436c9c0fea54247e73c163664a449997bf06058c24602aba7718c49a224f4e1adc74228a5837290b02bacabf37 SHA512 31b39f7a831e034fe6aeecb169dc46e1641c6844f74c4d74127b30cb691bb4fe4a52a998008c2a16b860398192508727cc3b87f9325d30b6e45f2d0d48ea2ee8 EBUILD zfs-kmod-2.1.2.ebuild 5263 BLAKE2B cfac8f441b725142fa66465972d4734107b04b2df17cf53cf1987d6af6aa9d5b05e9cc02825db79cf99c4b43dd6a40f32dd1ff734e4afd7bd3430d1540f02e06 SHA512 3c5f74e401e6735a4e8e8ba5a92e8d4e21cd46e7e81c863ceb65e068f2e96fb4c3f67e8e78eefbc4b95b8f943d1104ab8c037cbc55e24d3338051e297f1430f4 EBUILD zfs-kmod-9999.ebuild 5245 BLAKE2B 6770468fefbd8fb234452bc27c5fc3b2862a22a06ec4aef527e80f1aec34fc209ad59435914a551cd9529494f84cacbd2dd83e3944d0a73216195144b3afe20b SHA512 d535a279d7ee1cf24f2db571cc0f8e2f5e1444a19354898467ef0b6e625f68534993640e76c41246a7bc008a7d6ebdaa703deefde6f1cbe0f0d1a33b5c395c12 -MISC metadata.xml 540 BLAKE2B a0697b121d90cd8fc298b5647324fe513f6829f7054e9d2828aa7064b55ae28a991f791be136c7ea38e5e34d5061c40b2d313d418426da8c276481d2cae2da9d SHA512 5640db791cfb6a6c90f096a5e4b250ecf0089fd78f957566926880ab5fb9274a00f0788e5de73dd0c099c5decfa3239e8b2092f37b0183092abb17bb4a9b9dbf +MISC metadata.xml 651 BLAKE2B 477c5d768a2eddab7bc0c14d0845801e25bfd9298fe229a132d7ff11a8560988d0230ec5d4b1447df32f58b9754df0cbe989f2a5600cd3fa99124ea4edc45cdd SHA512 d9bf0598c87bcdaab7d81dd5502caf1400f3c8d3834a6770630d85ed365cd4ebb3beeebae72d2d4d49bcdd0aa6cd709aa57cb2af4195dfc04a9c0cef89cfd724 diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml index 789b42b040d7..936f4ff82c8e 100644 --- a/sys-fs/zfs-kmod/metadata.xml +++ b/sys-fs/zfs-kmod/metadata.xml @@ -13,6 +13,8 @@ <flag name="rootfs">Pull dependencies and check kernel options required for root-on-zfs</flag> </use> <upstream> + <bugs-to>https://github.com/openzfs/zfs/issues</bugs-to> + <doc>https://openzfs.github.io/openzfs-docs</doc> <remote-id type="github">openzfs/zfs</remote-id> </upstream> </pkgmetadata> diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild deleted file mode 100644 index f23afb773c2e..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild +++ /dev/null @@ -1,219 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools dist-kernel-utils flag-o-matic linux-mod toolchain-funcs - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_PV="${PV/_rc/-rc}" - SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz.asc )" - S="${WORKDIR}/zfs-${PV%_rc?}" - ZFS_KERNEL_COMPAT="5.14" - - # increments minor eg 5.14 -> 5.15, and still supports override. - ZFS_KERNEL_DEP="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - ZFS_KERNEL_DEP="${ZFS_KERNEL_DEP%%.*}.$(( ${ZFS_KERNEL_DEP##*.} + 1))" - - if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ppc64" - fi -fi - -LICENSE="CDDL MIT debug? ( GPL-2+ )" -SLOT="0/${PVR}" -IUSE="custom-cflags debug +rootfs" - -RDEPEND="${DEPEND} - !sys-kernel/spl -" - -BDEPEND=" - dev-lang/perl - virtual/awk -" - -# we want dist-kernel block in BDEPEND because of portage resolver. -# since linux-mod.eclass already sets version-unbounded dep, portage -# will pull new versions. So we set it in BDEPEND which takes priority. -# and we don't need in in git ebuild. -if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" - verify-sig? ( sec-keys/openpgp-keys-openzfs ) - dist-kernel? ( <virtual/dist-kernel-${ZFS_KERNEL_DEP}:= ) - " -fi - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set -PDEPEND="dist-kernel? ( ~sys-fs/zfs-${PV}[dist-kernel] )" - -RESTRICT="debug? ( strip ) test" - -DOCS=( AUTHORS COPYRIGHT META README.md ) - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -pkg_setup() { - CONFIG_CHECK=" - !DEBUG_LOCK_ALLOC - EFI_PARTITION - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - !TRIM_UNUSED_KSYMS - ZLIB_DEFLATE - ZLIB_INFLATE - " - - use debug && CONFIG_CHECK="${CONFIG_CHECK} - FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED - " - - use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} - BLK_DEV_INITRD - DEVTMPFS - " - - kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP" - - if [[ ${PV} != "9999" ]]; then - local kv_major_max kv_minor_max zcompat - zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}" - kv_major_max="${zcompat%%.*}" - zcompat="${zcompat#*.}" - kv_minor_max="${zcompat%%.*}" - kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \ - "Linux ${kv_major_max}.${kv_minor_max} is the latest supported version" - - fi - - kernel_is -ge 3 10 || die "Linux 3.10 or newer required" - - linux-mod_pkg_setup -} - -src_prepare() { - default - - # Run unconditionally (bug #792627) - eautoreconf - - if [[ ${PV} != "9999" ]]; then - # Set module revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi -} - -src_configure() { - set_arch_to_kernel - - use custom-cflags || strip-flags - - filter-ldflags -Wl,* - - # Set CROSS_COMPILE in the environment. - # This allows the user to override it via make.conf or via a local Makefile. - # https://bugs.gentoo.org/811600 - export CROSS_COMPILE=${CROSS_COMPILE-${CHOST}-} - - local myconf=( - HOSTCC="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - $(use_enable debug) - ) - - econf "${myconf[@]}" -} - -src_compile() { - set_arch_to_kernel - - myemakeargs=( - HOSTCC="$(tc-getBUILD_CC)" - V=1 - ) - - emake "${myemakeargs[@]}" -} - -src_install() { - set_arch_to_kernel - - myemakeargs+=( - DEPMOD=: - DESTDIR="${D}" - INSTALL_MOD_PATH="${EPREFIX:-/}" # lib/modules/<kver> added by KBUILD - ) - - emake "${myemakeargs[@]}" install - - einstalldocs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" - fi - - if [[ -z ${ROOT} ]] && use dist-kernel; then - set_arch_to_portage - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use x86 || use arm; then - ewarn "32-bit kernels will likely require increasing vmalloc to" - ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." - fi - - ewarn "This version of OpenZFS includes support for new feature flags" - ewarn "that are incompatible with previous versions. GRUB2 support for" - ewarn "/boot with the new feature flags is not yet available." - ewarn "Do *NOT* upgrade root pools to use the new feature flags." - ewarn "Any new pools will be created with the new feature flags by default" - ewarn "and will not be compatible with older versions of OpenZFS. To" - ewarn "create a newpool that is backward compatible wih GRUB2, use " - ewarn - ewarn "zpool create -d -o feature@async_destroy=enabled " - ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" - ewarn " -o feature@spacemap_histogram=enabled" - ewarn " -o feature@enabled_txg=enabled " - ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" - ewarn " ..." - ewarn - ewarn "GRUB2 support will be updated as soon as either the GRUB2" - ewarn "developers do a tag or the Gentoo developers find time to backport" - ewarn "support from GRUB2 HEAD." -} diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index a64a8bf581ee..b6f66c86f556 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,19 +1,15 @@ -AUX 2.0.4-scrub-timers.patch 2873 BLAKE2B 40986e258ddc3c5b4dfdebc8c2126fbb2c0ff9ac947700fa30c547795612fb98b2778f364ee10ec47c05a6837c4d4129918a6efe7cf3ab5854910e1892a3e348 SHA512 0e557974fe8992a7b0e6c15e46fac55d265e469aa13f85e85b0abe449b5fe2e8c51cf56510863fa2e33c060f2b38c0c43a910a740172ef1d4c42c0aa85e04ab9 AUX 2.0.7-scrub-timers.patch 3128 BLAKE2B f7f55905df7e804bef3818c4b5ce9c34595bcfd77c8d0fa3fb94156d878e077f878a3acd76cc92a57a056d9e8643c9d769cce0b1f067ab228f75d3242178b588 SHA512 a2a649e5b59af8dc26312cf8adf5716671da9e897788af3b6598eec653a5cd73ef25f703ac1b549c9927036738c016acc629c9bfc6dca0335b1d1327f85c6af4 AUX 2.1.2-musl-tests.patch 1923 BLAKE2B 0029cba42b7914166cec894e30730f205f2c1508dd7f0c46b2567c365b5c6daa1d65cfc9ede9180f4831c924760b6a9a9ac81972e991c439148ad21bfcb3dfda SHA512 be96efa5b0b407388fe4f0066c5516a1b882bb158376d072373d6c73f2dc1414a61eda925fa12a0708d15e5c791c590f4b83809262d21e2160a0d931e608ab80 AUX 2.1.2-openrc-vendor.patch 1469 BLAKE2B d8c20bbeee95db8eb4c26e6d5b1798e89c3b152c03ddc852dea6810fb170f70e77a200bdbda00953a792d05467f268260ccfcc1d1b20576bfb21c65fde6e93df SHA512 ae5709acef0531146f7ac020fd4038dc76f99dd43c8322b3934522c2e74f90d60106c30de679cb9aaaa3f6ece00ed93e490c0787e573fc0871c30d73842ea04e AUX 2.1.2-scrub-timers.patch 4260 BLAKE2B 1921e617aa97cb45a60b9f9649adb9ce2ea01a834e452c2af43360b04174ca92a8d2bf1b6e6ad7ebdeff97b82499cadcd996ecde2986d2f05102358f63d2a2d9 SHA512 f12865ebb649c7bba90e5f4ba2f901bb49c9d9d7d71d80bfa7402316773132a8a12ddd77de4bb60007aa5c5c050472d9bded410893a9ae5d9a9e87e0d2f03a40 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce -DIST zfs-2.0.6.tar.gz 13192941 BLAKE2B 3a83303b016ec4259c286af8a9ceb281829d26508d411df91dd94193bca8c3155ef0ba63604e95f6add5f0c6cf6d100b0f567efc33b6c484c9ff811924da6ccd SHA512 52a5576eed21868b2a3d63d05d3d8c35b5e59ee88c7ddab1dc070644539f9acd56bde43ba5e965ad951a6d50a014fb429a7977d2ab1a2bfcadd92ea78dd57bf8 -DIST zfs-2.0.6.tar.gz.asc 836 BLAKE2B 065eba3361ef4234acc67df0236ab9a6737ba9fe5a706be98b55dd64d10360160ca787d8873f27451a2107225ae657dc4cab20a7c2a268cd2de64c8d82d0327a SHA512 123569ecfcee22ac462160acf61b120144c774bc5c0d46a50d2b7312f7565da1a9d780e1a6207dba5834917c66d5b852763e4a3162378d5c9bb90b0dfde35c5c DIST zfs-2.0.7.tar.gz 14550055 BLAKE2B 80f7297f04a21cd8f3f2043d895b0325512ba0cea3bb9223561237754495c8233d29af5a9418a3c06a87510100240a45ef3d59c7ce776fffb5aafdcd18167c21 SHA512 1135abf74bf74685439018f7cd65fc52088f179d113bdd2e6481689bb0f4a016716a07d859107b74501fda00689e80b2488c7c2c53d5f058d6b659909ed85f6f DIST zfs-2.0.7.tar.gz.asc 836 BLAKE2B 65e7df58c33ccadc4e0ca9dbc1e8c006abbec8442e2da50872a1ab0cbb841fc45152298e8d3b93ee4320ddae6416e3a856caf80d8efb21b19db53dfedbf00e38 SHA512 b901d8e92faa6cfe6010bd54de88c7d18057f434cb07f8a89672d6c446a0a97b23209ee8f02cfd3b2a8f431c68ec977e7dc9f95fe5d385dba0bb6d37338ba682 DIST zfs-2.1.2.tar.gz 34829045 BLAKE2B ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 SHA512 3e3932259da2a27f1c4cca8da62b909edc43bf51ab0229d2d5d0234d9a7eaa7b63b67c06a98cbe2d29ba1eb5cbcaab16e5062c2a2bc8e84cab770be10ebf2102 DIST zfs-2.1.2.tar.gz.asc 836 BLAKE2B 8f5666f5c3d7016a4d79191f42d0a220fe8c654a0d64e3da3b575644fe52c83dcb9f9ef49ba0553771a127bba44e2802f1d366a7a38f670e73612deef76755c3 SHA512 da6bfccd19a249a6891f5e1de6c4b332e98ce4f125f638c046b9cedac3fd79c56a99dd9a620105a40741e5f04b382f5d5996b56cbe576fb268b31e57e0fed6eb EBUILD zfs-0.8.6-r2.ebuild 6559 BLAKE2B 6ae2951143257283909f0d0c9499003cbfa005c9bb59fb5ebd85993296ae5de11f0a9508e9d10cccee5acdcc5be99adc9c61ad9999988845b3d1c167ace3a5b7 SHA512 793fe4a87c1146912fc5e87c243b42e8cc22e8e2a75730c0b317b77811a50d1b4b0620afed1169395044ec90613491dac2e09b785f9facb3e83f0a7b4b3b52ee -EBUILD zfs-2.0.6-r1.ebuild 8393 BLAKE2B 42c547084c53b7c81e9faa0816cc8b48407dde3417c494cb35aede99c71d26721ca4d60648feae26ced588ccbf7053b9e371a18470ad503af75dd62d3727e1d2 SHA512 b57362a83a561dab8accbbefe7d73a9c1336f7cdaa9d0631b254fb5f2a5594d8152a0ba6169321cc0f5d150a0ae06a0ffb1f7ea25afe70e104a59821705cb4da EBUILD zfs-2.0.7.ebuild 8467 BLAKE2B 026a5e44ee82c68739e3e7ca6d2ba548a976889dfd901259b20d7d571a10fbdd6c73f8e011745d082d116294c171ad9ca34fef0800bd6d33bd77a33f38202a4f SHA512 9c7ad992b30ec5197338b1bb64cb8e8d7993667110e54c811948eac4f09e002e0a95e3eb48c09e668f64f5e25d277268f09994825204d5edd304c6feb5fb43f7 EBUILD zfs-2.1.2-r1.ebuild 8646 BLAKE2B 9443265873167bd5985050400d34c552254ed81e33bfc0bdaf0f7c375438bb34c90969f064034f60e60fb687ee088a8e06cc77c6b4fcfecff7253361f1f8363e SHA512 171b29c7ae59bf3ed69e9437f85ab48ddbdc70a27d39a33a812e71f95ee8a0ac52baef15fc6fbaef192b7402ccda273a03126119347e21cb834002b660e6bc70 EBUILD zfs-9999.ebuild 8634 BLAKE2B a611d956a49fcb371e223a821e58a101a3671e210a21076428a0f3ae2f3b3a3510ab85fd87f112be5ee340ce0208968f87d887dbb8b527c012f5d71ffa0c8302 SHA512 0d2020a7b34c860bd8b8f285300f9e52879178f3a942461801abc9a01b4c03841100b1a7e76bedae8dea5b3dcb9a3be7b880817febbc63182c98225959c24c2b -MISC metadata.xml 2083 BLAKE2B c2ca05dbbffefbc1dc1cf1f31187831ea1d41af36588527e2209799769154dd944d4afb0279aad6205ead61082113e91d8cc1654e99306ccb4f4949e529014ac SHA512 7227c36aa6ef74b765f67496d4ca1f0cb090e9890d972948dc440094f8c34098ef6618058ece20f4dd38efb426732cb1023a68b402a13290805b635b0204061a +MISC metadata.xml 2194 BLAKE2B 57b0d1bcbcd78039d0cfd20f087bdfc339eefebbec3150af3c06d2e1a6dee882c4f8f97a9e470f63d4d628441a10650bda8b1843e33240dcc8d3e2ad55d104ec SHA512 fac8750d64d844b397fbbdcca9b7aea671f7642c64da92b89480439919ced80b9b6292ee3a2cc55e412e3c55dd02c418ef7c056f2973b7eb0f53ee763e099098 diff --git a/sys-fs/zfs/files/2.0.4-scrub-timers.patch b/sys-fs/zfs/files/2.0.4-scrub-timers.patch deleted file mode 100644 index 6aae1e4de596..000000000000 --- a/sys-fs/zfs/files/2.0.4-scrub-timers.patch +++ /dev/null @@ -1,97 +0,0 @@ -From e23d7e03637e377591a480d87630b746cdaa377f Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev <gyakovlev@gentoo.org> -Date: Sat, 22 May 2021 22:27:39 -0700 -Subject: [PATCH] systemd: add weekly and monthly scrub timers - -timers can be enabled as follows: - -systemctl enable zfs-scrub-weekly@rpool.timer --now -systemctl enable zfs-scrub-monthly@datapool.timer --now - -Each timer will pull in zfs-scrub@${poolname}.service, which is not -schedule-specific. - -Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org> ---- - etc/systemd/system/Makefile.am | 5 ++++- - etc/systemd/system/zfs-scrub-monthly@.timer.in | 12 ++++++++++++ - etc/systemd/system/zfs-scrub-weekly@.timer.in | 12 ++++++++++++ - etc/systemd/system/zfs-scrub@.service.in | 12 ++++++++++++ - 4 files changed, 40 insertions(+), 1 deletion(-) - create mode 100644 etc/systemd/system/zfs-scrub-monthly@.timer.in - create mode 100644 etc/systemd/system/zfs-scrub-weekly@.timer.in - create mode 100644 etc/systemd/system/zfs-scrub@.service.in - -diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am -index c374a52ac..5e65e1db4 100644 ---- a/etc/systemd/system/Makefile.am -+++ b/etc/systemd/system/Makefile.am -@@ -12,7 +12,10 @@ systemdunit_DATA = \ - zfs-volume-wait.service \ - zfs-import.target \ - zfs-volumes.target \ -- zfs.target -+ zfs.target \ -+ zfs-scrub-monthly@.timer \ -+ zfs-scrub-weekly@.timer \ -+ zfs-scrub@.service - - SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA) - -diff --git a/etc/systemd/system/zfs-scrub-monthly@.timer.in b/etc/systemd/system/zfs-scrub-monthly@.timer.in -new file mode 100644 -index 000000000..4c585f45f ---- /dev/null -+++ b/etc/systemd/system/zfs-scrub-monthly@.timer.in -@@ -0,0 +1,12 @@ -+[Unit] -+Description=Monthly zpool scrub timer for %i -+Documentation=man:zpool-scrub(8) -+ -+[Timer] -+OnCalendar=monthly -+AccuracySec=1h -+Persistent=true -+Unit=zfs-scrub@%i.service -+ -+[Install] -+WantedBy=timers.target -diff --git a/etc/systemd/system/zfs-scrub-weekly@.timer.in b/etc/systemd/system/zfs-scrub-weekly@.timer.in -new file mode 100644 -index 000000000..b2454be2c ---- /dev/null -+++ b/etc/systemd/system/zfs-scrub-weekly@.timer.in -@@ -0,0 +1,12 @@ -+[Unit] -+Description=Weekly zpool scrub timer for %i -+Documentation=man:zpool-scrub(8) -+ -+[Timer] -+OnCalendar=weekly -+AccuracySec=1h -+Persistent=true -+Unit=zfs-scrub@%i.service -+ -+[Install] -+WantedBy=timers.target -diff --git a/etc/systemd/system/zfs-scrub@.service.in b/etc/systemd/system/zfs-scrub@.service.in -new file mode 100644 -index 000000000..720901165 ---- /dev/null -+++ b/etc/systemd/system/zfs-scrub@.service.in -@@ -0,0 +1,12 @@ -+[Unit] -+Description=zpool scrub on %i -+Documentation=man:zpool-scrub(8) -+Requires=zfs.target -+After=zfs.target -+ConditionPathIsDirectory=/sys/module/zfs -+ -+[Service] -+Nice=19 -+IOSchedulingClass=idle -+KillSignal=SIGINT -+ExecStart=@sbindir@/zpool scrub %i --- -2.31.1 - diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml index 78f7538fc6a6..8b7415ecf550 100644 --- a/sys-fs/zfs/metadata.xml +++ b/sys-fs/zfs/metadata.xml @@ -17,6 +17,8 @@ <flag name="test-suite">Install regression test suite</flag> </use> <upstream> + <bugs-to>https://github.com/openzfs/zfs/issues</bugs-to> + <doc>https://openzfs.github.io/openzfs-docs</doc> <remote-id type="github">openzfs/zfs</remote-id> </upstream> <longdescription lang="en"> diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild deleted file mode 100644 index f5ad730973d9..000000000000 --- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -DISTUTILS_USE_SETUPTOOLS=manual -PYTHON_COMPAT=( python3_{7,8,9} ) - -inherit autotools bash-completion-r1 dist-kernel-utils distutils-r1 flag-o-matic linux-info pam systemd udev usr-ldscript - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://github.com/openzfs/zfs" - -if [[ ${PV} == "9999" ]]; then - inherit git-r3 linux-mod - EGIT_REPO_URI="https://github.com/openzfs/zfs.git" -else - VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc - inherit verify-sig - - MY_P="${P/_rc/-rc}" - SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz" - SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )" - S="${WORKDIR}/${P%_rc?}" - - if [[ ${PV} != *_rc* ]]; then - KEYWORDS="amd64 arm64 ppc64" - fi -fi - -LICENSE="BSD-2 CDDL MIT" -# just libzfs soname major for now. -# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered. -# see libsoversion_check() below as well -SLOT="0/4" -IUSE="custom-cflags debug dist-kernel kernel-builtin minimal nls pam python +rootfs test-suite" - -DEPEND=" - net-libs/libtirpc:= - sys-apps/util-linux - sys-libs/zlib - virtual/libudev:= - dev-libs/openssl:0= - !minimal? ( ${PYTHON_DEPS} ) - pam? ( sys-libs/pam ) - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="virtual/awk - virtual/pkgconfig - nls? ( sys-devel/gettext ) - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -if [[ ${PV} != "9999" ]] ; then - BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-openzfs )" -fi - -# awk is used for some scripts, completions, and the Dracut module -RDEPEND="${DEPEND} - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV}:= ) - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - virtual/awk - dist-kernel? ( virtual/dist-kernel:= ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-kernel/genkernel-3.5.1.1 - ) - test-suite? ( - sys-apps/kmod[tools] - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - ) -" - -# PDEPEND in this form is needed to trick portage suggest -# enabling dist-kernel if only 1 package have it set, without suggesting to disable -PDEPEND="dist-kernel? ( ~sys-fs/zfs-kmod-${PV}[dist-kernel] )" - -# temporary block new coreutils -# https://github.com/openzfs/zfs/issues/11900 -RDEPEND+=" - <sys-apps/coreutils-9 -" - -REQUIRED_USE=" - !minimal? ( ${PYTHON_REQUIRED_USE} ) - python? ( !minimal ) - test-suite? ( !minimal ) -" - -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/bash-completion-sudo.patch" - "${FILESDIR}/2.0.4-scrub-timers.patch" -) - -pkg_pretend() { - use rootfs || return 0 - - if has_version virtual/dist-kernel && ! use dist-kernel; then - ewarn "You have virtual/dist-kernel installed, but" - ewarn "USE=\"dist-kernel\" is not enabled for ${CATEGORY}/${PN}" - ewarn "It's recommended to globally enable dist-kernel USE flag" - ewarn "to auto-trigger initrd rebuilds with kernel updates" - fi -} - -pkg_setup() { - if use kernel_linux; then - linux-info_pkg_setup - - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - if use test-suite; then - if linux_chkconfig_present BLK_DEV_LOOP; then - eerror "The ZFS test suite requires loop device support enabled." - eerror "Please enable it:" - eerror " CONFIG_BLK_DEV_LOOP=y" - eerror "in /usr/src/linux/.config or" - eerror " Device Drivers --->" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -libsoversion_check() { - - local bugurl libzfs_sover - bugurl="https://bugs.gentoo.org/enter_bug.cgi?form_name=enter_bug&product=Gentoo+Linux&component=Current+packages" - - libzfs_sover="$(grep 'libzfs_la_LDFLAGS += -version-info' lib/libzfs/Makefile.am \ - | grep -Eo '[0-9]+:[0-9]+:[0-9]+')" - libzfs_sover="${libzfs_sover%%:*}" - - if [[ ${libzfs_sover} -ne $(ver_cut 2 ${SLOT}) ]]; then - echo - eerror "BUG BUG BUG BUG BUG BUG BUG BUG" - eerror "ebuild subslot does not match libzfs soversion!" - eerror "libzfs soversion: ${libzfs_sover}" - eerror "ebuild value: $(ver_cut 2 ${SLOT})" - eerror "This is a bug in the ebuild, please use the following URL to report it" - eerror "${bugurl}&short_desc=${CATEGORY}%2F${P}+update+subslot" - echo - # we want to abort for releases, but just print a warning for live ebuild - # to keep package installable - [[ ${PV} == "9999" ]] || die - fi -} - -src_prepare() { - default - libsoversion_check - - # Run unconditionally (bug #792627) - eautoreconf - - if [[ ${PV} != "9999" ]]; then - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi - - # prevent errors showing up on zfs-mount stop, #647688 - # openrc will unmount all filesystems anyway. - sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die -} - -src_configure() { - use custom-cflags || strip-flags - use minimal || python_setup - - local myconf=( - --bindir="${EPREFIX}/bin" - --enable-shared - --enable-systemd - --enable-sysvinit - --localstatedir="${EPREFIX}/var" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="${EPREFIX}/usr/lib/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-pamconfigsdir="${EPREFIX}/unwanted_files" - --with-pammoduledir="$(getpam_mod_dir)" - --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="$(systemd_get_systempresetdir)" - --with-vendor=gentoo - $(use_enable debug) - $(use_enable nls) - $(use_enable pam) - $(use_enable python pyzfs) - --disable-static - $(usex minimal --without-python --with-python="${EPYTHON}") - ) - - econf "${myconf[@]}" -} - -src_compile() { - default - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_compile - popd >/dev/null || die - fi -} - -src_install() { - default - - gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool - - use pam && { rm -rv "${ED}/unwanted_files" || die ; } - - use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; } - - find "${ED}" -name '*.la' -delete || die - - dobashcomp contrib/bash_completion.d/zfs - bashcomp_alias zfs zpool - - # strip executable bit from conf.d file - fperms 0644 /etc/conf.d/zfs - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_install - popd >/dev/null || die - fi - - # enforce best available python implementation - use minimal || python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - # we always need userspace utils in sync with zfs-kmod - # so force initrd update for userspace as well, to avoid - # situation when zfs-kmod trigger initrd rebuild before - # userspace component is rebuilt - # KV_* variables are provided by linux-info.eclass - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" - fi - - if use rootfs; then - if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then - elog "Root on zfs requires an initramfs to boot" - elog "The following packages provide one and are tested on a regular basis:" - elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" - elog " sys-kernel/genkernel" - fi - fi - - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - einfo "Adding ${P} to the module database to ensure that the" - einfo "kernel modules and userland utilities stay in sync." - update_moduledb - fi - - if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" - einfo "for default zfs systemd service configuration" - else - [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ - einfo "You should add zfs-import to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ - einfo "You should add zfs-mount to the boot runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ - einfo "You should add zfs-share to the default runlevel." - [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ - einfo "You should add zfs-zed to the default runlevel." - fi -} - -pkg_postrm() { - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - remove_moduledb - fi -} |