diff options
Diffstat (limited to 'sys-fs')
34 files changed, 703 insertions, 1007 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex b3a4cd51f3f4..184e69fcd616 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 623542fefcfa..f6715e3aa5fd 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 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 -EBUILD btrfs-progs-9999.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374 +EBUILD btrfs-progs-5.15.1.ebuild 3015 BLAKE2B 0ee2f0de803c128ed6bcceb449bc612fbab278c02695e3fab18df69f90f17b41b6275f87ddb3a252d363c9dcd7ae29cc9ebfe09fbcfccfadb76ce46442e1449f SHA512 96d76a1973db45a2ce9bb7f1f92b8f95c215542f6b87630065faa9f94b398849c03aeab66ae42d4c86da9059e179688933b8a42cc471b4e4add3d495593f63ff +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 36548f98db8a..1669da04cd9e 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-5.15.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit bash-completion-r1 python-single-r1 @@ -12,7 +12,7 @@ libbtrfs_soname=0 if [[ ${PV} != 9999 ]]; then MY_PV="v${PV/_/-}" [[ "${PV}" = *_rc* ]] || \ - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz" S="${WORKDIR}/${PN}-${MY_PV}" else diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild index 36548f98db8a..ffe30a969ded 100644 --- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild +++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit bash-completion-r1 python-single-r1 diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest index 1152cdddd1c7..ead6f699203c 100644 --- a/sys-fs/eudev/Manifest +++ b/sys-fs/eudev/Manifest @@ -1,8 +1,6 @@ -AUX 40-gentoo.rules 365 BLAKE2B ac97d87870286b489804d319bbc7ee6fdbc480d0cf811d422b25cc3466542f34e849c3c6aac29f55ad1fbcfebeb943b8782e146f803a0a945f65893300c83806 SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b +AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a0d8617812f26744c0454f10f5f829031f8668a345c35034ec68396cbf07792a4a83a87e3816001bb SHA512 8ef1b911843ab13acb1c1b9b7a0a5cd76659f395c3db9e579429556f23eacebb414507dc0231e2455e7589bc70054fa1e6b6dd93dd833f7101c0da0597aabf88 -DIST eudev-3.2.10.tar.gz 1961960 BLAKE2B 3708c78fad3abad6aa4b2beaaa325e25e118621aa2e6cb351732f6d8349dc17da9be852cab79045c7a513e927c2d1266c6443814fd264943765d98fb5b404e75 SHA512 d0a076d8a54e9d4ca9ca48cf885d082965144b322950d351b7ead4a5035c2dad6fd66b7f137d7281982876c3c50330cdd5e599788f23e1369388181dd178941d DIST eudev-3.2.11.tar.gz 2254373 BLAKE2B cfa6235d6509b751fde93ff2b0961b93c3741458e561a7ad9b07b49a57779627532cff25ad3519e5f79320854fcedfcdc23642ef542505cebcd6b2803067389a SHA512 17b328365913af3e434abe667dd0498c3702a41c6cb66f3793ca2c195b05ac06397b0a401077f81df7dd25193e4eeea13657a221ca6cb3d237c4d91e31e30b33 -EBUILD eudev-3.2.10-r1.ebuild 6973 BLAKE2B 4951dcd4fc1e1c8cba9aabb97f2d09d3447ddb7ab89adef7b049d638d6c82bf934d085f8df4f659c7e80bcf3e803b513c4b3a161ed364cfff2766cd43659bef4 SHA512 fbe1a5e1da7a836c41026ef6a4a73d4f56c20793e45faec6e114d8dd16d239d1b101efa6e80ad8447f077c6ed87824c4744e8506349eff0f02dcff03c2e3c937 -EBUILD eudev-3.2.11.ebuild 6856 BLAKE2B 88bf5e0f826ccddf58593fc9bc5e362808e69fa1ceb2600572425f00f02c0af21de0cf98717bfe9e923bdcec81b2997c6fcef02428a8beca3f46cc4c92334b48 SHA512 dc5e36e2073fd363a9582a52dab0f9c84fd16458622020a08a64e73ec81df241f73789d9fe51d35a0bf05992d15c5bbb5183afdc26a5f57b67e25fea24054324 +EBUILD eudev-3.2.11-r1.ebuild 6856 BLAKE2B 88bf5e0f826ccddf58593fc9bc5e362808e69fa1ceb2600572425f00f02c0af21de0cf98717bfe9e923bdcec81b2997c6fcef02428a8beca3f46cc4c92334b48 SHA512 dc5e36e2073fd363a9582a52dab0f9c84fd16458622020a08a64e73ec81df241f73789d9fe51d35a0bf05992d15c5bbb5183afdc26a5f57b67e25fea24054324 EBUILD eudev-9999.ebuild 6863 BLAKE2B 8cc05463b8c914bf3b460cc929df84961d8c27f63a18aef95bb6680de247a947e7dd6f01e047fa3052f4fc75be693ee14b0a8692052c284fe4bf709c80abca29 SHA512 380bfb084e4836a71a138225a77b33ab5da6b78db96dad14a78a3eedbdea585fca7fd7f9ac2a0513d55d3bfa5c29ed6b8672635e2c743cc04630b45bd8115971 -MISC metadata.xml 721 BLAKE2B 632d4454c02f58d293a7c8c8fd889085e5942a946d1238c0b8e38e4ff6a9aa7d6a7ec8c3980a36669fe05a32273ba828c4d89980d4cec8866379fc0a77d743ef SHA512 6f65edb2f3edad63fea660718bf770bac44cf4ed6bb5cc4ef8e48fcaab566378f24af8610ce7e9493e1541bcb3249d9c74324e2d0cb970e4bbfa194b8a157921 +MISC metadata.xml 629 BLAKE2B c67407dd805c6e8d4fb0c5152e897263ca56649d1d5c7692c74a69a751e7824a2b6084fe1ce0f8cd1b13dbdd0ae3f082430d6552807690a9d52d83c907f43f64 SHA512 204a04a68ee53fe8fec226ad82fdbb3f2ee478f538379466343bbf55fd0146a71889ac11742d59261ef954bb9b8e09e8d2b9416079da63cc78ab400efd2ba49b diff --git a/sys-fs/eudev/eudev-3.2.10-r1.ebuild b/sys-fs/eudev/eudev-3.2.10-r1.ebuild deleted file mode 100644 index 32609688f692..000000000000 --- a/sys-fs/eudev/eudev-3.2.10-r1.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -KV_min=2.6.39 - -inherit autotools linux-info multilib multilib-minimal toolchain-funcs - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://github.com/gentoo/eudev.git" - inherit git-r3 -else - SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz" - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://github.com/gentoo/eudev" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test" -RESTRICT="!test? ( test )" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - virtual/libcrypt:= - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - !<sys-libs/glibc-2.11 - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd" -DEPEND="${COMMON_DEPEND} - dev-util/gperf - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-${KV_min} - test? ( app-text/tree dev-lang/perl )" - -RDEPEND="${COMMON_DEPEND} - acct-group/input - acct-group/kvm - acct-group/render - !<sys-fs/lvm2-2.02.103 - !<sec-policy/selinux-base-2.20120725-r10 - !sys-fs/udev - !sys-apps/systemd" - -PDEPEND=">=sys-fs/udev-init-scripts-26 - hwdb? ( >=sys-apps/hwids-20140304[udev] )" - -MULTILIB_WRAPPED_HEADERS=( - /usr/include/udev.h -) - -pkg_pretend() { - ewarn - ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality," - ewarn "as described in the URL below:" - ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - ewarn - ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing" - ewarn "between the default or user-modified choice of sys-fs/udev. If you wish to disable" - ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules" - ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules" - ewarn -} - -pkg_setup() { - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX" - linux-info_pkg_setup - get_running_version - - # These are required kernel options, but we don't error out on them - # because you can build under one kernel and run under another. - if kernel_is lt ${KV_min//./ }; then - ewarn - ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}." - ewarn "Make sure to run udev under kernel version ${KV_min} or above." - ewarn - fi -} - -src_prepare() { - # change rules back to group uucp instead of dialout for now - sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \ - || die "failed to change group dialout to uucp" - - eapply_user - eautoreconf -} - -multilib_src_configure() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - ac_cv_search_cap_init= - ac_cv_header_sys_capability_h=yes - DBUS_CFLAGS=' ' - DBUS_LIBS=' ' - --with-rootprefix= - --with-rootrundir=/run - --exec-prefix="${EPREFIX}" - --bindir="${EPREFIX}"/bin - --includedir="${EPREFIX}"/usr/include - --libdir="${EPREFIX}"/usr/$(get_libdir) - --with-rootlibexecdir="${EPREFIX}"/lib/udev - --enable-split-usr - --enable-manpages - --disable-hwdb - ) - - # Only build libudev for non-native_abi, and only install it to libdir, - # that means all options only apply to native_abi - if multilib_is_native_abi; then - econf_args+=( - --with-rootlibdir="${EPREFIX}"/$(get_libdir) - $(use_enable introspection) - $(use_enable kmod) - $(use_enable static-libs static) - $(use_enable selinux) - $(use_enable rule-generator) - ) - else - econf_args+=( - --disable-static - --disable-introspection - --disable-kmod - --disable-selinux - --disable-rule-generator - ) - fi - ECONF_SOURCE="${S}" econf "${econf_args[@]}" -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake -C src/shared - emake -C src/libudev - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - emake DESTDIR="${D}" install - else - emake -C src/libudev DESTDIR="${D}" install - fi -} - -multilib_src_test() { - # make sandbox get out of the way - # these are safe because there is a fake root filesystem put in place, - # but sandbox seems to evaluate the paths of the test i/o instead of the - # paths of the actual i/o that results. - # also only test for native abi - if multilib_is_native_abi; then - addread /sys - addwrite /dev - addwrite /run - default_src_test - fi -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - - insinto /lib/udev/rules.d - doins "${FILESDIR}"/40-gentoo.rules - - use rule-generator && doinitd "${FILESDIR}"/udev-postmount -} - -pkg_postinst() { - mkdir -p "${EROOT}"run - - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 - # So try to remove it here (will only work if empty). - rmdir "${EROOT}"dev/loop 2>/dev/null - if [[ -d ${EROOT}dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - # REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't, - # process it as a list. We only care about the zero case (new install) or the case where - # the same version is being re-emerged. If there is a second version, allow it to abort. - local rv rvres=doitnew - for rv in ${REPLACING_VERSIONS} ; do - if [[ ${rvres} == doit* ]]; then - if [[ ${rv%-r*} == ${PV} ]]; then - rvres=doit - else - rvres=${rv} - fi - fi - done - - if use hwdb && has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - # reload database after it has be rebuilt, but only if we are not upgrading - # also pass if we are -9999 since who knows what hwdb related changes there might be - if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then - udevadm control --reload - fi - fi - if [[ ${rvres} != doitnew ]]; then - ewarn - ewarn "You need to restart eudev as soon as possible to make the" - ewarn "upgrade go into effect:" - ewarn "\t/etc/init.d/udev --nodeps restart" - fi - - if use rule-generator && \ - [[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then - ewarn - ewarn "Please add the udev-postmount init script to your default runlevel" - ewarn "to ensure the legacy rule-generator functionality works as reliably" - ewarn "as possible." - ewarn "\trc-update add udev-postmount default" - fi - - elog - elog "For more information on eudev on Gentoo, writing udev rules, and" - elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev" -} diff --git a/sys-fs/eudev/eudev-3.2.11.ebuild b/sys-fs/eudev/eudev-3.2.11-r1.ebuild index 0ad41a30ab58..0ad41a30ab58 100644 --- a/sys-fs/eudev/eudev-3.2.11.ebuild +++ b/sys-fs/eudev/eudev-3.2.11-r1.ebuild diff --git a/sys-fs/eudev/files/40-gentoo.rules b/sys-fs/eudev/files/40-gentoo.rules index 365c6ea0d441..6b96bd07051e 100644 --- a/sys-fs/eudev/files/40-gentoo.rules +++ b/sys-fs/eudev/files/40-gentoo.rules @@ -1,10 +1,3 @@ -# do not edit this file, it will be overwritten on update - -# Propably unrequired, check how it is with OSS/OSS4, then remove -SUBSYSTEM=="snd", GROUP="audio" - -# Gentoo specific usb group -SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - -# Keep this for Linux 2.6.32 support wrt #457868 -SUBSYSTEM=="mem", KERNEL=="null|zero|full|random|urandom", MODE="0666" +# Gentoo specific groups +ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" +ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" diff --git a/sys-fs/eudev/metadata.xml b/sys-fs/eudev/metadata.xml index 4ea35bd6e025..859a60f953f6 100644 --- a/sys-fs/eudev/metadata.xml +++ b/sys-fs/eudev/metadata.xml @@ -5,7 +5,6 @@ <email>eudev@gentoo.org</email> </maintainer> <use> - <flag name="hwdb">read vendor/device string database and add it to udev database</flag> <flag name="kmod">enable module loading through libkmod</flag> <flag name="rule-generator">install legacy rule generator rules and support scripts - note that the functionality within was dropped from <pkg>sys-fs/udev</pkg> as it is not stable in diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest index 4c6ed7c24c41..ccc930021297 100644 --- a/sys-fs/fuse-overlayfs/Manifest +++ b/sys-fs/fuse-overlayfs/Manifest @@ -1,3 +1,5 @@ DIST fuse-overlayfs-1.7.1.tar.gz 103575 BLAKE2B 1fc92852f3afdead707af8745db03e2f5b0cf1f154f12c13850e5c37b30a0ad84122aa06c7f96c3825cd89cc2d26874abecb8ffbf0ad4edec5e0ffc854962944 SHA512 2199f9a5040832537b57792fe361943065c6132d31613bb1f838e931049703011902fca3abc25f6d7136efb2eb5505161f11c252b91dfb19158ac663e1ec15c2 +DIST fuse-overlayfs-1.8.tar.gz 103726 BLAKE2B 12da116bba60c5833b43d130b24ba6a60fcaabe1248226fa30e8c0b2c2439a438c66b39d28a8d3dd0f65bf353c38811e87f23a2fdbd830982063a7b5df7b4808 SHA512 68a7b6a41fd2c44fbfb194d324cc6869d7f6ce198f7ff3ddf74e91f9679785ffa610634a6e35c2661549e0bb776bf68741be45501d860b1e8dd6814d2b3fb0ab EBUILD fuse-overlayfs-1.7.1.ebuild 570 BLAKE2B 5b4ff524cbe5ade3296faf95f7e781900e35f22d8a2a26773a4718d4c5c061378c5909f31909cdbbf641e6d83d01fc15ec880f938831c2c8ae61d5b1e11913c9 SHA512 135662cfd48682fd582f9328dc7a2553cb93241b97b498f75502b06d85fa10eb38614d929199c3cf3f0b0faf466ad81b2fb371344eb80af5f566e14576cbbd58 +EBUILD fuse-overlayfs-1.8.ebuild 572 BLAKE2B 914440d5b4371a8a8cd119a9d55cb921b88499d1125b8bb6ceb3828237de51186e57580975d6ab01a2a6deb823a4a552c6f8ed85a50e6f30a648134c9ebea3c1 SHA512 ab3a027788a4fbc926ef42cdfc1e7754ae70129786425646b1109385b888c4f7fc06b334c3f3ba9062cc0efa425670804416d684ec4a397294dd97335f909bc1 MISC metadata.xml 335 BLAKE2B be5c19676e0ab40869fde84241fc093e7af2ee0eb41844f1a0685bd8b2a828d2899fd130c4b1b40553f2a3e4700cfa2a82e393553cd1022ed4d4b9c10768781f SHA512 31fdf31f0b44eeafc2b32dcbb9b99bee6af7331a7a7f140d4cca92a617933d9be460cafeb65d6dc0096308698eda28e006d31a42a114efe9633d9864d4611b3e diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.ebuild new file mode 100644 index 000000000000..f86accf13a28 --- /dev/null +++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.8.ebuild @@ -0,0 +1,26 @@ +# Copyright 2019-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="FUSE implementation for overlayfs" +HOMEPAGE="https://github.com/containers/fuse-overlayfs" +EGIT_COMMIT="v${PV}" +SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~ppc64" + +RDEPEND=">=sys-fs/fuse-3:=" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}" + +src_prepare() { + default + eautoreconf +} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 0efdabceaa04..6b9fae457bdf 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,13 +1,6 @@ -AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45 -AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f -AUX 249-udev-linux-headers-5-15.patch 828 BLAKE2B 767e5b7ad7320e5fb5e75939bcb4c65ea99d914a9446725da1f1019d088c1830f2760c07d9c16fdd301b92761494b296ee70ac16ee43db4bd4a3307b2f1302bb SHA512 ed88ed1dcd3e18cfc5d19244eeb681bb9091098163f0c93d523f9d180648eace1c05b328285e9980be861655515f89b068d6fe0d05aa09639e1b71bd1db143af AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b -DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c -DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b DIST systemd-stable-249.6.tar.gz 10599611 BLAKE2B 9c0cbaa4319f2ce9a78dbe820d1b6df5191e6c632e2eac9f71f9ff9817564d9b3fc177d2aec0c0daea8ac33bbdc2066ad68a8967cf8857f4af3668b9a3e7d3bf SHA512 7a7791dfe4923c00987b924adcb1cd08c4d17af2b17b4c6c6c701856c6810cfda61f06821c39787339fc05293853c0ea61b9973fcf4495c7bf4f8054ecfae66f -EBUILD udev-249-r3.ebuild 7609 BLAKE2B bdae4a297aa37813ff99a4821822719d51458d12cb8ab246ff89149dd358d36c9df30edafe6dfe51779cc3c4ed21f9e32230677ecad49d3e2917e837c1b523da SHA512 aa1d2a58c28a30ee488a3f9424946240dc08d2e47524250b023326e4bb7ec73630ddcd8ebd01c53280c5bee78ae4e1cb67868b339483625647a0a19aa8413d14 EBUILD udev-249.6-r2.ebuild 7917 BLAKE2B 8b48f9aa00ca2eddd0aa921d4adda3e8e506d0a895753ca9e6c64037f3cefb7b0a65c62e370a9064e3f2668524e21ac89bec18907b7e575cdab16791ca997726 SHA512 238b0daa2283b89b0b6c970e53c677073b851c1672fea1734393cd00e7a30af6ac0084583f41af733cf848101a3c091b1d0cfaff375d9a4910896177100fab0f -EBUILD udev-249.6.ebuild 7771 BLAKE2B 0f5657c096483c9ddab5f749c2b250c64c4a7e7cb5df7e5dd8f45dbf76ccf181871a2ccff06ed807d5cd56fa581233ae7486ae78b095b6fb17dbc8051e1e7450 SHA512 c0ae5006e6bef8a035884e067f9d277761dac0883fe93842ddd999ccd24c0c90f4984ab99e5120e06e1121a75b1346b218e13318992db3fab73106dac044e616 EBUILD udev-9999.ebuild 7921 BLAKE2B 6005fae7b9012a23f0a6c398d0381f725bf9afdb7469397ba887b37b290f3686c0f6dd5f9925b221d3d3fc333efd37fe5fa7d069c0635c1eb630ce78903b9ccc SHA512 8d55530628495ff6566575d0942380db6512cf307d74141c3af8a1738b30d8f34a20fc1d56161779a5654045929984d76b233aa499ac5e583ef93bc5c69ccdfc MISC metadata.xml 475 BLAKE2B 51db3fcfdcb7942e2bfa6e3e9fac08f9a0de6018e08a04da65920d1c1e83af6620ef73dfff201f1feff31580a0a6341814a8182e43b2c07f9da7577252010ad1 SHA512 65c1345e9c0707248f12bbf436f9b0ccb6160eb86d6c22f3e62b34791879621df59eb195e4c4c95b5cf9440b052bdc7c2b5847789a44cc9fb13b6cd4867f580e diff --git a/sys-fs/udev/files/249-libudev-static.patch b/sys-fs/udev/files/249-libudev-static.patch deleted file mode 100644 index 73375b716e9b..000000000000 --- a/sys-fs/udev/files/249-libudev-static.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f2c57d4f3805775e0ffdc80ce578eaa737017d31 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Fri, 9 Jul 2021 13:05:23 -0400 -Subject: [PATCH] libudev: add "Libs.private: -lrt -pthread" to libudev.pc - -This resolves a failure when linking cryptsetup.static against libudev.a. - -``` -libtool: link: x86_64-pc-linux-gnu-gcc -Wall -O2 -pipe -march=amdfam10 -static -O2 -o cryptsetup.static lib/utils_crypt.o lib/utils_loop.o lib/utils_io.o lib/utils_blkid.o src/utils_tools.o src/utils_password.o src/utils_luks2.o src/utils_blockdev.o src/cryptsetup.o -pthread -pthread -Wl,--as-needed ./.libs/libcryptsetup.a -largon2 -lrt -ljson-c -lpopt -luuid -lblkid -lssl -lcrypto -lz -ldl -ldevmapper -lm -lpthread -ludev -pthread -/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/../../../../lib64/libudev.a(src_libsystemd_sd-daemon_sd-daemon.c.o): in function `sd_is_mq': -(.text.sd_is_mq+0x3a): undefined reference to `mq_getattr' -``` ---- - src/libudev/libudev.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/libudev/libudev.pc.in b/src/libudev/libudev.pc.in -index 89028aaa6bf2..1d6487fa4084 100644 ---- a/src/libudev/libudev.pc.in -+++ b/src/libudev/libudev.pc.in -@@ -16,4 +16,5 @@ Name: libudev - Description: Library to access udev device information - Version: {{PROJECT_VERSION}} - Libs: -L${libdir} -ludev -+Libs.private: -lrt -pthread - Cflags: -I${includedir} diff --git a/sys-fs/udev/files/249-sys-include-posix.patch b/sys-fs/udev/files/249-sys-include-posix.patch deleted file mode 100644 index 6d9e0039b9c9..000000000000 --- a/sys-fs/udev/files/249-sys-include-posix.patch +++ /dev/null @@ -1,67 +0,0 @@ -Silence annoying #warning's on musl - -https://github.com/systemd/systemd/pull/20362 -https://github.com/systemd/systemd/pull/20364 - -From f8d54f7810aeea5ff27a5db03e1aab7ea54c8268 Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Mon, 2 Aug 2021 12:41:38 +0200 -Subject: [PATCH] Use correct `<fcntl.h>` include - -* `<sys/fcntl.h>` is not specified in POSIX ---- - src/basic/fileio.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/fileio.h b/src/basic/fileio.h -index af797cfafdbf..4295b84a85c5 100644 ---- a/src/basic/fileio.h -+++ b/src/basic/fileio.h -@@ -2,11 +2,11 @@ - #pragma once - - #include <dirent.h> -+#include <fcntl.h> - #include <stdbool.h> - #include <stddef.h> - #include <stdio.h> - #include <sys/stat.h> --#include <sys/fcntl.h> - #include <sys/types.h> - - #include "macro.h" -From 2b6c0bb2a341c95223ce672249e43c743b03d78c Mon Sep 17 00:00:00 2001 -From: David Seifert <soap@gentoo.org> -Date: Mon, 2 Aug 2021 16:09:10 +0200 -Subject: [PATCH] Use correct `<poll.h>` include - -* `<sys/poll.h>` is not specified in POSIX ---- - src/shared/nscd-flush.c | 2 +- - src/shared/varlink.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/shared/nscd-flush.c b/src/shared/nscd-flush.c -index dfc47c423441..19e16d93455c 100644 ---- a/src/shared/nscd-flush.c -+++ b/src/shared/nscd-flush.c -@@ -1,5 +1,5 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ --#include <sys/poll.h> -+#include <poll.h> - - #include "fd-util.h" - #include "io-util.h" -diff --git a/src/shared/varlink.c b/src/shared/varlink.c -index 3a53c16a7242..4033947d3b8c 100644 ---- a/src/shared/varlink.c -+++ b/src/shared/varlink.c -@@ -1,7 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - - #include <malloc.h> --#include <sys/poll.h> -+#include <poll.h> - - #include "alloc-util.h" - #include "errno-util.h" diff --git a/sys-fs/udev/files/249-udev-linux-headers-5-15.patch b/sys-fs/udev/files/249-udev-linux-headers-5-15.patch deleted file mode 100644 index 844099b72819..000000000000 --- a/sys-fs/udev/files/249-udev-linux-headers-5-15.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://github.com/systemd/systemd-stable/pull/132/commits/92bbfcdc733d39ec4097d8678bc92a7aaaf78ae1.patch -https://bugs.gentoo.org/821550 - -From: Chris Packham <chris.packham@alliedtelesis.co.nz> -Date: Fri, 10 Sep 2021 09:51:36 +1200 -Subject: [PATCH 1/2] basic/linux: Sync if_arp.h with Linux 5.14 - -ARPHRD_MCTP was added in 5.14. Sync if_arp.h to pick up the definition - -Fixes #20694 - -(cherry picked from commit 7c5b9952c4f6e2b72f90edbe439982528b7cf223) ---- a/src/basic/linux/if_arp.h -+++ b/src/basic/linux/if_arp.h -@@ -54,6 +54,7 @@ - #define ARPHRD_X25 271 /* CCITT X.25 */ - #define ARPHRD_HWX25 272 /* Boards with X.25 in firmware */ - #define ARPHRD_CAN 280 /* Controller Area Network */ -+#define ARPHRD_MCTP 290 - #define ARPHRD_PPP 512 - #define ARPHRD_CISCO 513 /* Cisco HDLC */ - #define ARPHRD_HDLC ARPHRD_CISCO diff --git a/sys-fs/udev/udev-249-r3.ebuild b/sys-fs/udev/udev-249-r3.ebuild deleted file mode 100644 index 84fa631f0f66..000000000000 --- a/sys-fs/udev/udev-249-r3.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 2003-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript - -if [[ ${PV} = 9999* ]] ; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]] ; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - - MY_PV="${PV/_/-}" - MY_P="${MY_PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - - # musl patches taken from: - # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd - SRC_URI+=" - elibc_musl? ( - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${PV}.1-r1.tar.xz - )" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux test" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-util/gperf - sys-devel/gettext - >=sys-apps/coreutils-8.16 - virtual/pkgconfig - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - test? ( - app-text/tree - dev-lang/perl - ) -" -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-15 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.9 -" -RDEPEND="${COMMON_DEPEND} - acct-group/kmem - acct-group/tty - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/input - acct-group/kvm - acct-group/lp - acct-group/render - acct-group/tape - acct-group/video - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd -" -PDEPEND=">=sys-apps/hwids-20140304[udev] - >=sys-fs/udev-init-scripts-34" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]] ; then - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" - linux-info_pkg_setup - - # CONFIG_FHANDLE was introduced by 2.6.39 - local MINKV=2.6.39 - - if kernel_is -lt ${MINKV//./ } ; then - eerror "Your running kernel is too old to run this version of ${P}" - eerror "You need to upgrade kernel at least to ${MINKV}" - fi - - if kernel_is -lt 3 7 ; then - ewarn "Your running kernel is too old to have firmware loader and" - ewarn "this version of ${P} doesn't have userspace firmware loader" - ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" - fi - fi -} - -src_prepare() { - local PATCHES=( - # backport from 250 to silence musl warnings - "${FILESDIR}/249-sys-include-posix.patch" - "${FILESDIR}/249-libudev-static.patch" - "${FILESDIR}/249-udev-linux-headers-5-15.patch" - ) - use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) - - default -} - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool acl) - -Defi=false - $(meson_native_use_bool kmod) - $(meson_native_use_bool selinux) - -Dlink-udev-shared=false - -Dsplit-usr=true - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - - # Prevent automagic deps - -Dgcrypt=false - -Dlibcryptsetup=false - -Didn=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dp11kit=false - -Dseccomp=false - -Dlz4=false - -Dxz=false - ) - use elibc_musl && emesonargs+=( - -Dgshadow=false - -Dsmack=false - -Dutmp=false - ) - - meson_src_configure -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - python_setup - - use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 - - multilib-minimal_src_configure -} - -multilib_src_compile() { - # meson creates this link - local libudev=$(readlink libudev.so.1) - - local targets=( - ${libudev} - src/libudev/libudev.pc - ) - if multilib_is_native_abi; then - targets+=( - udevadm - src/udev/ata_id - src/udev/cdrom_id - src/udev/fido_id - src/udev/mtd_probe - src/udev/scsi_id - src/udev/udev.pc - src/udev/v4l_id - man/udev.conf.5 - man/systemd.link.5 - man/hwdb.7 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - rules.d/50-udev-default.rules - rules.d/64-btrfs.rules - ) - fi - eninja "${targets[@]}" -} - -src_test() { - # The testsuite is *very* finicky. Don't try running it in - # containers or anything but a full VM or on bare metal. - # udev calls 'mknod' a number of times, and this interacts - # badly with kernel namespaces. - - if [[ ! -w /dev ]]; then - ewarn "udev tests needs full access to /dev" - ewarn "Skipping tests" - else - meson-multilib_src_test - fi -} - -multilib_src_test() { - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" - - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die - - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die -} - -multilib_src_install() { - local libudev=$(readlink libudev.so.1) - - dolib.so {${libudev},libudev.so.1,libudev.so} - gen_usr_ldscript -a udev - - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - - if multilib_is_native_abi ; then - into / - dobin udevadm - - dosym ../../bin/udevadm /lib/systemd/systemd-udevd - - exeinto /lib/udev - doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} - - # Install generated rules (${BUILD_DIR}/rules.d/*.rules) - insinto /lib/udev/rules.d - doins rules.d/*.rules - - insinto /usr/share/pkgconfig - doins src/udev/udev.pc - - mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die - rm man/systemd-udevd-{control,kernel}.socket.8 || die - doman man/*.[0-9] - fi -} - -multilib_src_install_all() { - doheader src/libudev/libudev.h - - insinto /etc/udev - doins src/udev/udev.conf - keepdir /etc/udev/{hwdb.d,rules.d} - - insinto /lib/systemd/network - doins network/99-default.link - - # Install static rules (${S}/rules.d/*.rules) - insinto /lib/udev/rules.d - doins rules.d/*.rules - doins "${FILESDIR}"/40-gentoo.rules - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - - einstalldocs -} - -pkg_preinst() { - has_version 'sys-fs/eudev' && HAD_EUDEV=1 -} - -pkg_postinst() { - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]' ; then - udevadm hwdb --update --root="${ROOT}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi - - if [[ ${HAD_EUDEV} -eq 1 ]] ; then - ewarn - ewarn "${P} defaults to predictable interface renaming, as described in the URL below:" - ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - ewarn - ewarn "If you wish to disable this, please see the above documentation, or set" - ewarn "net.ifnames=0 on the kernel command line." - ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" - fi -} diff --git a/sys-fs/udev/udev-249.6.ebuild b/sys-fs/udev/udev-249.6.ebuild deleted file mode 100644 index 513cbfac6257..000000000000 --- a/sys-fs/udev/udev-249.6.ebuild +++ /dev/null @@ -1,303 +0,0 @@ -# Copyright 2003-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) - -inherit bash-completion-r1 flag-o-matic linux-info meson-multilib ninja-utils python-any-r1 toolchain-funcs udev usr-ldscript - -if [[ ${PV} = 9999* ]] ; then - EGIT_REPO_URI="https://github.com/systemd/systemd.git" - inherit git-r3 -else - if [[ ${PV} == *.* ]] ; then - MY_PN=systemd-stable - else - MY_PN=systemd - fi - - MY_PV="${PV/_/-}" - MY_P="${MY_PN}-${MY_PV}" - S="${WORKDIR}/${MY_P}" - SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz" - - # musl patches taken from: - # http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd - MUSL_PATCHSET="249.5-r1" - SRC_URI+=" - elibc_musl? ( - https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz - )" - - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux test" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-util/gperf - sys-devel/gettext - >=sys-apps/coreutils-8.16 - virtual/pkgconfig - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - test? ( - app-text/tree - dev-lang/perl - ) -" -COMMON_DEPEND=" - >=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}] - sys-libs/libcap:0=[${MULTILIB_USEDEP}] - virtual/libcrypt:=[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-15 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) -" -DEPEND="${COMMON_DEPEND} - >=sys-kernel/linux-headers-3.9 -" -RDEPEND="${COMMON_DEPEND} - acct-group/kmem - acct-group/tty - acct-group/audio - acct-group/cdrom - acct-group/dialout - acct-group/disk - acct-group/input - acct-group/kvm - acct-group/lp - acct-group/render - acct-group/tape - acct-group/video - !sys-apps/gentoo-systemd-integration - !sys-apps/systemd -" -PDEPEND=">=sys-apps/hwids-20140304[udev] - >=sys-fs/udev-init-scripts-34" - -python_check_deps() { - has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != buildonly ]] ; then - CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX" - linux-info_pkg_setup - - # CONFIG_FHANDLE was introduced by 2.6.39 - local MINKV=2.6.39 - - if kernel_is -lt ${MINKV//./ } ; then - eerror "Your running kernel is too old to run this version of ${P}" - eerror "You need to upgrade kernel at least to ${MINKV}" - fi - - if kernel_is -lt 3 7 ; then - ewarn "Your running kernel is too old to have firmware loader and" - ewarn "this version of ${P} doesn't have userspace firmware loader" - ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7" - fi - fi -} - -src_prepare() { - local PATCHES=( - ) - use elibc_musl && PATCHES+=( "${WORKDIR}"/musl-patches ) - - default -} - -multilib_src_configure() { - local emesonargs=( - $(meson_native_use_bool acl) - -Defi=false - $(meson_native_use_bool kmod) - $(meson_native_use_bool selinux) - -Dlink-udev-shared=false - -Dsplit-usr=true - -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" - - # Prevent automagic deps - -Dgcrypt=false - -Dlibcryptsetup=false - -Didn=false - -Dlibidn=false - -Dlibidn2=false - -Dlibiptc=false - -Dp11kit=false - -Dseccomp=false - -Dlz4=false - -Dxz=false - ) - use elibc_musl && emesonargs+=( - -Dgshadow=false - -Dsmack=false - -Dutmp=false - ) - - meson_src_configure -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - python_setup - - use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 - - multilib-minimal_src_configure -} - -multilib_src_compile() { - # meson creates this link - local libudev=$(readlink libudev.so.1) - - local targets=( - ${libudev} - src/libudev/libudev.pc - ) - if multilib_is_native_abi; then - targets+=( - udevadm - src/udev/ata_id - src/udev/cdrom_id - src/udev/fido_id - src/udev/mtd_probe - src/udev/scsi_id - src/udev/udev.pc - src/udev/v4l_id - man/udev.conf.5 - man/systemd.link.5 - man/hwdb.7 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - rules.d/50-udev-default.rules - rules.d/64-btrfs.rules - ) - fi - eninja "${targets[@]}" -} - -src_test() { - # The testsuite is *very* finicky. Don't try running it in - # containers or anything but a full VM or on bare metal. - # udev calls 'mknod' a number of times, and this interacts - # badly with kernel namespaces. - - if [[ ! -w /dev ]]; then - ewarn "udev tests needs full access to /dev" - ewarn "Skipping tests" - else - meson-multilib_src_test - fi -} - -multilib_src_test() { - # two binaries required by udev-test.pl - eninja systemd-detect-virt test-udev - local -x PATH="${PWD}:${PATH}" - - # prepare ${BUILD_DIR}/test/sys, required by udev-test.pl - "${EPYTHON}" "${S}"/test/sys-script.py test || die - - # the perl script contains all the udev tests - "${S}"/test/udev-test.pl || die -} - -multilib_src_install() { - local libudev=$(readlink libudev.so.1) - - dolib.so {${libudev},libudev.so.1,libudev.so} - gen_usr_ldscript -a udev - - insinto "/usr/$(get_libdir)/pkgconfig" - doins src/libudev/libudev.pc - - if multilib_is_native_abi ; then - into / - dobin udevadm - - dosym ../../bin/udevadm /lib/systemd/systemd-udevd - - exeinto /lib/udev - doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id} - - # Install generated rules (${BUILD_DIR}/rules.d/*.rules) - insinto /lib/udev/rules.d - doins rules.d/*.rules - - insinto /usr/share/pkgconfig - doins src/udev/udev.pc - - mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die - rm man/systemd-udevd-{control,kernel}.socket.8 || die - doman man/*.[0-9] - fi -} - -multilib_src_install_all() { - doheader src/libudev/libudev.h - - insinto /etc/udev - doins src/udev/udev.conf - keepdir /etc/udev/{hwdb.d,rules.d} - - insinto /lib/systemd/network - doins network/99-default.link - - # Install static rules (${S}/rules.d/*.rules) - insinto /lib/udev/rules.d - doins rules.d/*.rules - doins "${FILESDIR}"/40-gentoo.rules - - dobashcomp shell-completion/bash/udevadm - - insinto /usr/share/zsh/site-functions - doins shell-completion/zsh/_udevadm - - einstalldocs -} - -pkg_preinst() { - has_version 'sys-fs/eudev' && HAD_EUDEV=1 -} - -pkg_postinst() { - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]' ; then - udevadm hwdb --update --root="${ROOT}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi - - if [[ ${HAD_EUDEV} -eq 1 ]] ; then - ewarn - ewarn "${P} defaults to predictable interface renaming, as described in the URL below:" - ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - ewarn - ewarn "If you wish to disable this, please see the above documentation, or set" - ewarn "net.ifnames=0 on the kernel command line." - ewarn "See also: https://wiki.gentoo.org/wiki/Udev#Optional:_Disable_or_override_predictable_network_interface_naming" - if [[ -e ${EROOT}/etc/udev/rules.d/80-net-name-slot.rules ]]; then - ewarn - ewarn "Detected '${EROOT}/etc/udev/rules.d/80-net-name-slot.rules'" - ewarn "Renaming to '${EROOT}/etc/udev/rules.d/80-net-setup-link.rules'" - mv "${EROOT}"/etc/udev/rules.d/80-net-{name-slot,setup-link}.rules - fi - fi -} diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest index 908c41183b6f..7c90596cde85 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 2282 BLAKE2B 5f7c6db0bf9b64cc5ce50bad5069c1317aae97d78e22e568e1d5f97dd2f2cd8da3db1050ce4627e97c8693f5b4363f5c4eafb88807b366adea366344c06df05a SHA512 da77fc4b1c58db2a4efb0c9bfa66b6405244aaa5a7e04d5c4437ca884599e5330247a81941f8c3884a666db24577e091fc0145d479331e3dd5c6f43ba3870dcb +EBUILD xfsprogs-5.14.2.ebuild 2276 BLAKE2B 42259bd5637cd5d24e042c07bcbb1892d7a5719780bf5b4a9622fc7292bf68277f0e514c5fdbb4b01ac8d4d4f881d23b60d5a4b3ea0bd79ec1620a76602e9461 SHA512 2346390ff04bac2a638850af7a86e5070447f0ec220f3de30e53fbca7dbdf28e45cfdb33823dd052f2f7c7798e4a004237e484cdace35a7a5f21dfb97c968b23 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 f1ec2e50d05c..8f0ddb754f48 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 2ca8c1bcf0b3..3f8ae68b198f 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -2,10 +2,13 @@ AUX 0.8.6-copy-builtin.patch 988 BLAKE2B f79add4b341075e3cd98b6aee4bb74b8fadd28b 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 5749 BLAKE2B 867ba8d060dc08eae4027d8c6e17f8ed31f429c87cc0ad9faa88aab0ee60d91e0a2a1d0b9dc59974d3c406a6266d4a4f752dab9e909a0df18ddf5c65152e6e13 SHA512 3f7303584c5324ed8715cd5a473344564ce2862b3e730722ac128a758f2750c1cb3ab2521185eae6e237ec1aa5dda82b8780009a51fc6798e27fc45b18c96f6a -EBUILD zfs-kmod-2.0.6.ebuild 6044 BLAKE2B bccfccf6b6a101e67448fa592cce63dee9b7eba6bdb2b925c6f0e7d6605137a87cf2d6ea2e231c20adb2cdf53a716ccccd22d2b3d8d2e555e71e8fb6f6313c81 SHA512 4834745ccdf0d77ff8aa9ec8a5796ef4ed2209e8735c86bb3762080ba95e6d34963ca9ee87320d216ccd68e1faef2d7f411a2dd4cbcab4df9c0e438fe85049ea -EBUILD zfs-kmod-2.1.2.ebuild 5260 BLAKE2B 57af8a2b3d4dfbe46828dc052b222f4f4cb7ace95a6e116ccd62616892a2fdc9b414f23ed6853e870f6623bf010e2b08048fce35ef1de04aebe136f65797fa25 SHA512 de5a2d68b49355302c1b534c0d416001bffd1f0e44d2f6e9eda4054c2a7dd090d57c5f692c76528552ca84f3481ee582e8816e698e12969ab8d927c86b33e8b2 -EBUILD zfs-kmod-9999.ebuild 5242 BLAKE2B 7ed1e8a1afc61c7df54cdfd2cef35490a6f0ccc69a2178292048b9ea22732fa9505d85fa8f09cd64a6e0cefb086f5c0e030527651e902c023571ea4f56a87f46 SHA512 ab608b6814a9178970124790eb6849a6bf62178fb0d091248a608b63d5a5152e53d4889a3bcd9c1f34505ab98c8adf1c6161706c2b52e19e33064fb364a08f2b -MISC metadata.xml 549 BLAKE2B ae860684a4cf82c277fe91d11e0bcf283103a08442e78584c9962b1571efed7e6ee0e215f3341263f809978e63e01d70275a80fa4996b8265569539e0b2ffe34 SHA512 7a97c7965147549da470c9d5d3a541284964c5ec276d005a2f7aa1a4550c915cce32b2593257e5ad373c84955e3bf74b235297d540364ee4a17cf9e1e705b650 +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 diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml index 5698442202d7..789b42b040d7 100644 --- a/sys-fs/zfs-kmod/metadata.xml +++ b/sys-fs/zfs-kmod/metadata.xml @@ -10,9 +10,9 @@ <name>Sam James</name> </maintainer> <use> - <flag name="rootfs">Install zfs-shutdown script to support exporting a pool containing rootfs</flag> + <flag name="rootfs">Pull dependencies and check kernel options required for root-on-zfs</flag> </use> <upstream> - <remote-id type="github">zfsonlinux/zfs</remote-id> + <remote-id type="github">openzfs/zfs</remote-id> </upstream> </pkgmetadata> diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild index 3d63f3f393bf..f3bf1e8c644e 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -196,7 +196,7 @@ pkg_postinst() { 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 ZFSOnLinux. To" + 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 " diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild index 69f6e20a0db0..f23afb773c2e 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.6.ebuild @@ -203,7 +203,7 @@ pkg_postinst() { 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 ZFSOnLinux. To" + 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 " diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild new file mode 100644 index 000000000000..154ef6022aef --- /dev/null +++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.7.ebuild @@ -0,0 +1,212 @@ +# 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.15" + + # 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 + + 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 + + if has_version sys-boot/grub; then + 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." + fi +} diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild index 65b9253ee17a..44f7926e35bd 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.2.ebuild @@ -195,11 +195,11 @@ pkg_postinst() { 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 ZFSOnLinux. To" + 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 -o compatibility=grub2 ..." ewarn - ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features." + ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features." fi } diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 16b9466d2567..5a3434fb444c 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -195,11 +195,11 @@ pkg_postinst() { 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 ZFSOnLinux. To" + 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 -o compatibility=grub2 ..." ewarn - ewarn "Refer to /etc/zfs/compatibility.d/grub2 for list of features." + ewarn "Refer to /usr/share/zfs/compatibility.d/grub2 for list of features." fi } diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index c9a9350056b8..a64a8bf581ee 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -1,4 +1,5 @@ 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 @@ -6,10 +7,13 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069 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 6508 BLAKE2B 8751f1d3dda492fbdea68898ef30390c90df7cec9fe47a589916cf7beddf7bfa486f14c39ecd35f9ae1abce78435934a70ff761cc789b3ef2fdf5ca840102988 SHA512 e7fe2f7ca4a44aa4cf6f71642c8da4d581d4f7fd80466b688e5f6404920fab93ce110554858477a9705e6a434ed097e3a7b97ab0b77da663227c18c1e623c330 -EBUILD zfs-2.0.6-r1.ebuild 8342 BLAKE2B dad25c713d73cf005157d8112d1006d849f0fb23f8ac3622d126d0e6e6565f46fb2ca390ff797038cf638179bf3321b61494d9e0eac956e11f00cc22ef374041 SHA512 269cc5deecf2778c49db1e61a4dd0b83e5efb34b52c28008cb1967233a596f5de7163a810a2ab1cf634df53cd48557cecbf960f3bc8e37a348370796d0563944 -EBUILD zfs-2.1.2-r1.ebuild 8595 BLAKE2B 83c3496d1d9b21a76294445155e5c6090124ba364c953965d5d5a31499b94ddd73440387178044850725caaa37f5bfcaae20abf57ec940f76664a829b849b0b3 SHA512 5f5894ee61c06a8be07ce4aaca11f1a21657901df0c95877151505383f85bcd1a19da1894323ca4df14c42fa546da159cc3541c8d756d8f3bce8553e40bf347e -EBUILD zfs-9999.ebuild 8583 BLAKE2B 7a7c9f0c247bee1230969f16e82c62ae92a9d88f9c4682e2cdcf0a41a80eb9bbd6e3aa638d6b06fb620f0f8bdd918c07fa59f8644aeb1898f1c5eebb012ac897 SHA512 6efc5e8a87e1c53efe92c6c6bf8066e497b6d6ad404b4829104799d3398a9aa38a23de60e04b4d472de3450bea1a6c61bdb924af53e957f95e803e4e69a40733 -MISC metadata.xml 1001 BLAKE2B 8e94a0d8e1afff064b3f8e4a7e3e6d34ad12d5fa550df2f3371b1593b0938b3ea0dbfdcd2e40023f4e91bbe12cf1f3633d92977e4f5b4ee10b56d5040f065f90 SHA512 fc7ba310676715f5daa59b30107560f9ba61cc7dc79eb74ff866e4c8f36bd6a414474a216f5c833dc46c6426e4c80a6672b488fab4178a0c00a47b0de1caf6eb +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 diff --git a/sys-fs/zfs/files/2.0.7-scrub-timers.patch b/sys-fs/zfs/files/2.0.7-scrub-timers.patch new file mode 100644 index 000000000000..7c7bd1b874ea --- /dev/null +++ b/sys-fs/zfs/files/2.0.7-scrub-timers.patch @@ -0,0 +1,99 @@ +From 2c9844d159024d4c742d24639a218213fb53d537 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev <gyakovlev@gentoo.org> +Date: Sat, 22 May 2021 22:27:39 -0700 +Subject: [PATCH 1/2] 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/.gitignore | 1 + + 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 | 14 ++++++++++++++ + 5 files changed, 43 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..903068468 +--- /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 ++Persistent=true ++RandomizedDelaySec=1h ++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..ede699500 +--- /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 ++Persistent=true ++RandomizedDelaySec=1h ++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..c04ac292a +--- /dev/null ++++ b/etc/systemd/system/zfs-scrub@.service.in +@@ -0,0 +1,14 @@ ++[Unit] ++Description=zpool scrub on %i ++Documentation=man:zpool-scrub(8) ++Requires=zfs.target ++After=zfs.target ++ConditionACPower=true ++ConditionPathIsDirectory=/sys/module/zfs ++ ++[Service] ++ExecStart=/bin/sh -c '\ ++if @sbindir@/zpool status %i | grep "scrub in progress"; then\ ++exec @sbindir@/zpool wait -t scrub %i;\ ++else exec @sbindir@/zpool scrub -w %i; fi' ++ExecStop=-/bin/sh -c '@sbindir@/zpool scrub -p %i 2>/dev/null || true' +-- +2.34.1 diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml index 29c6291bc939..78f7538fc6a6 100644 --- a/sys-fs/zfs/metadata.xml +++ b/sys-fs/zfs/metadata.xml @@ -17,6 +17,24 @@ <flag name="test-suite">Install regression test suite</flag> </use> <upstream> - <remote-id type="github">zfsonlinux/zfs</remote-id> + <remote-id type="github">openzfs/zfs</remote-id> </upstream> + <longdescription lang="en"> + OpenZFS is an advanced file system and volume manager which was originally developed + for Solaris and is now maintained by the OpenZFS community + + It includes the functionality of both traditional file systems and volume manager. + It has many advanced features including: + * Protection against data corruption. Integrity checking for both data and metadata. + * Continuous integrity verification and automatic “self-healing” repair + * Data redundancy with mirroring, RAID-Z1/2/3 [and DRAID] + * Support for high storage capacities — up to 256 trillion yobibytes (2^128 bytes) + * Space-saving with transparent compression using LZ4, GZIP or ZSTD + * Hardware-accelerated native encryption + * Efficient storage with snapshots and copy-on-write clones + * Efficient local or remote replication — send only changed blocks with ZFS send and receive + + The OpenZFS project brings together developers from the Linux, FreeBSD, illumos, MacOS, and Windows platforms. + OpenZFS is supported by a wide range of companies. + </longdescription> </pkgmetadata> diff --git a/sys-fs/zfs/zfs-0.8.6-r2.ebuild b/sys-fs/zfs/zfs-0.8.6-r2.ebuild index df9295794bab..2ac686b80913 100644 --- a/sys-fs/zfs/zfs-0.8.6-r2.ebuild +++ b/sys-fs/zfs/zfs-0.8.6-r2.ebuild @@ -213,7 +213,7 @@ pkg_postinst() { if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then elog "root on zfs requires initramfs to boot" elog "the following packages known to provide one and tested on regular basis:" - elog " sys-kernel/dracut" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" elog " sys-kernel/genkernel" fi fi diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild index b90eb7e6aea6..f5ad730973d9 100644 --- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild +++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild @@ -269,7 +269,7 @@ pkg_postinst() { 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" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" elog " sys-kernel/genkernel" fi fi diff --git a/sys-fs/zfs/zfs-2.0.7.ebuild b/sys-fs/zfs/zfs-2.0.7.ebuild new file mode 100644 index 000000000000..49a33456ec22 --- /dev/null +++ b/sys-fs/zfs/zfs-2.0.7.ebuild @@ -0,0 +1,303 @@ +# 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_{8..10} ) + +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}] + || ( + dev-python/packaging[${PYTHON_USEDEP}] + dev-python/distlib[${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? ( + app-shells/ksh + 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] )" + +REQUIRED_USE=" + !minimal? ( ${PYTHON_REQUIRED_USE} ) + python? ( !minimal ) + test-suite? ( !minimal ) +" + +RESTRICT="test" + +PATCHES=( + "${FILESDIR}/bash-completion-sudo.patch" + "${FILESDIR}/2.0.7-scrub-timers.patch" + "${FILESDIR}/2.1.2-openrc-vendor.patch" + "${FILESDIR}/2.1.2-musl-tests.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 +} diff --git a/sys-fs/zfs/zfs-2.1.2-r1.ebuild b/sys-fs/zfs/zfs-2.1.2-r1.ebuild index a5b0419a7ed8..241e00cc3ec6 100644 --- a/sys-fs/zfs/zfs-2.1.2-r1.ebuild +++ b/sys-fs/zfs/zfs-2.1.2-r1.ebuild @@ -271,7 +271,7 @@ pkg_postinst() { 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" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" elog " sys-kernel/genkernel" fi fi diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 9a69934d3bb9..c5b347c4f1a2 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -265,7 +265,7 @@ pkg_postinst() { 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" + elog " sys-kernel/dracut ( preferred, module maintained by zfs developers )" elog " sys-kernel/genkernel" fi fi |