diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-10 05:25:01 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-10 05:25:01 +0000 |
commit | 456dbeaab3e2f71f527eae542ab44d1e372b0655 (patch) | |
tree | 5cee708ec6e4b4e530a4337e7389598dc7cd6144 /sys-fs/zfs-kmod | |
parent | 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 (diff) |
gentoo resync : 10.01.2018
Diffstat (limited to 'sys-fs/zfs-kmod')
-rw-r--r-- | sys-fs/zfs-kmod/Manifest | 10 | ||||
-rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild | 8 | ||||
-rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild | 8 | ||||
-rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild | 144 | ||||
-rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild | 8 | ||||
-rw-r--r-- | sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 6 |
6 files changed, 23 insertions, 161 deletions
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 1df7ae115597..b26fcc099084 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,11 +1,9 @@ DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 DIST zfs-0.6.5.4-patches-p1.tar.xz 64004 BLAKE2B e9db3c1bde3a2636b35a4204c484bc4cec0968278519762707849ba138eeb9128130de70c2f40bb28dc9102347465d724a60cebd45ddb12d4217739ecbed7714 SHA512 9203356b43bdad2ed78c946af8c95c9fc4d2996b41a09a3b1f5a8657d2742ac69d10b4a87d443db497d591878cf7a70ebb19762b0df135ee25f4e8d2ed6ad71f DIST zfs-0.6.5.4.tar.gz 2506470 BLAKE2B 10a2242081891b94a7863f11b4c3b9e443d3b75b5eb03e8fc88e30484a94555203dec8964075cf23f694777dd699e20acb1a52b5d04cba410b6df84512436e08 SHA512 90c87cd95fd06cf34755358e7cc4053d19f351316133f0b808e7585a3fc8f82e7c0f49072c2995d0520de5104fd04d91a166a0d5b6c923c82dfb2fb4f7f57a01 -DIST zfs-0.7.3.tar.gz 6393145 BLAKE2B ed384306cdee1ff5450e45981bbb19e7f399a637f2c08ee1c31ab155f8ca9e7b6526ca9241e1aa8ae9aa55d51898d3525d149027e68ce2c454f9fafb44badfcf SHA512 fe116fd787050f7bc099fe3ed5335c2d18711e5e665af5be13b3971939258e036e273432e80106e704f037d1f6e3114b12e26b01f97b575723f8bd46acdcbf61 DIST zfs-0.7.5.tar.gz 6403102 BLAKE2B 5159b2ab811b2f7bcbbc708814e07e68b0b38d7b5fca4a82205c7bb4332155121f1385f2cd3a6b7acb6bd64d13b9ad2af85d42b90623efb0f33a2f542fb90803 SHA512 3512aaa6225f74323f2d14e029a113593e0cf44be2ab18cc42dcb82d237b88843ccd7e48ed73a4c6f6da574151c1af461e0528725e11bcb42280467e37f63df2 -EBUILD zfs-kmod-0.6.5.11.ebuild 4052 BLAKE2B 27fcb967595af5e7143f195cd1ac1a83b2fc8c7949a7656895f210e6a3b9faaffa923a9a74da6a0b0d4a4a67e9e79a4dadf23b58894d9aa1b18e35998253f9de SHA512 773bb52b42462b69d5911e7f02a503872080f8c9c98c9a35959caaba65aa5cdf940f874f0b5058dd47548c6e3bc296b949ff37d46a4d9cdae177f289e83c1abd -EBUILD zfs-kmod-0.6.5.4-r1.ebuild 4383 BLAKE2B 61bb38fa95f2366f5006542cce80ae85f83fb73970261cef261595777dcd476b76bd28bae91baa44f30e279ce225db4cf24985fe392a50b7c569557fa5c140ea SHA512 185070373e51629e463764b277a51dddd43e254075523f96e3b6a108199927581ebec5d5eb1a1728450a131515d51c3f469dee40635832806334dc98e99fea91 -EBUILD zfs-kmod-0.7.3.ebuild 4052 BLAKE2B 292b339a1fbcb506d15f362e4daceb926e6f62fba60f56393c9f01bbdcaabff8e699c7f32162c059f6aa2824c21b686c8200dc54f919f164683a9047e16b0f73 SHA512 cb81f3f2e1cb2a421f8d8adcba919f90057627353427d8b94cddf733eb7581f20a14822a305aa0ff8cf936d7abd7b9fc7a680aace3cb9214ebfaea6d5e4bccd2 -EBUILD zfs-kmod-0.7.5.ebuild 4052 BLAKE2B 0afadf74a2ce76eba01d1288f55bbceaf7db306fb55cbad7ec35ff523c3a999390a6f98b1250288e351ab330608081fe6b454a095e7bb6e41ceee4f49a9213ff SHA512 3b5422f662f3b3ed4248e27962c32472a89c8aaa7d174aa4084ef857cf9fb0106bcadae09c2e3ea0bc09a549113e5ba881f43e9671335f841326d9f2eba9c74f -EBUILD zfs-kmod-9999.ebuild 4068 BLAKE2B 96f808668b5cd0214d895e177a221e5bb22bc4387d8a330a65d3e62448da7984753000f51d7be1640b7461de849f93c782eca7ec7f7dbc21624242a839a93f53 SHA512 2e421316f3bcad2cf939b3930a8a8e65f37682063737259ff19a4cc76fc3cb2d23845e24b1b8c23accdbfea1f1168c94b37759bd181a9302a0a723c537d84a60 +EBUILD zfs-kmod-0.6.5.11.ebuild 4075 BLAKE2B a1b642691217beee71f20c29932e2de6b65e2e0745ddf940f63ee1f434c6a5a72ced4f877f4e9201ec0f2ea5e59657f591da9819212838f3e07388fb55c6e372 SHA512 07ef13d00c98c90e0a7759a4fa68fe40ba43f9db3ab180b8203358d812c817f90819bcf45f4451e1b94e319a0e0ec5ea035b34d4bb3eb813053a9eb7dc128040 +EBUILD zfs-kmod-0.6.5.4-r1.ebuild 4401 BLAKE2B a4648117230b7351ad427a7d93d704162eab8561b048730e28224594f2653e2a975da34e66a59de007c61187beb504cc8e263942602f141c7afee75cb670a43f SHA512 589e0c952efe6bc9d2fe0b1a85c0309eefa64a3c632f5030112b613d3c2d2c177a8fd7b501b0296ed74e040e3a574296c5acf86701925154377bf479b8d3aaad +EBUILD zfs-kmod-0.7.5.ebuild 4075 BLAKE2B 0b96f439ca7245cac88595998a3781f54a1651e4352ec71e61ad9292a771cf642a056294492b12f9a2fd6a77a4ff1ea589713e2b83e03660691dda894f66f5df SHA512 376b3c08104d7722c240617c377cb9c87c6e0cacf401107b26fdd54c121d36d53fded91c2279a4471eb4629429133a550ba6beb990805ba9e109d765a33d8215 +EBUILD zfs-kmod-9999.ebuild 4092 BLAKE2B 9aff1a1edb78f8c445ae022c153cf8c8afd524c97e47542f74b11f6248642a638f81c03a6403376b6d92c51512abd9238806c81eec33acc52dc682706fd5191e SHA512 f8d8674dd7ff3692735f242c3634671a617ae0e2de6530dc380ea58292f9a6c9d5829f4b0548e677471224b2fe9796ba11ee069d2bf66bb5f9611a3acbcd4b2e MISC metadata.xml 554 BLAKE2B 3f2673ca745f69a68210ee7e14ef93037285807fb174aad38913c9478ce4f38459cb000ad46f9b6b37a62f3f13287fba9f646bdf55a3c6126704082ecb6294e6 SHA512 c5dbcf5b795510abbe6c6dbea53ea6b9a438f0b2b8f7af28ae3ec9d8816d51c6ee22938bfe7d222d5b451065b57447064fba59e93a9621f1132e3d27ef8d385b diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild index ddbb09881e76..680b00083e5c 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" + KEYWORDS="~amd64" fi inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils @@ -40,7 +40,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) pkg_setup() { linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + !CONFIG_REISER4_FS EFI_PARTITION IOSCHED_NOOP MODULES diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild index 2b7c7f36b229..10bb6ec32857 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -13,7 +13,7 @@ if [ ${PV} == "9999" ]; then inherit git-r3 else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz - https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p${PR#r}.tar.xz" + https://dev.gentoo.org/~ryao/dist/zfs-${PV}-patches-p1.tar.xz" S="${WORKDIR}/zfs-${PV}" KEYWORDS="~amd64 ~arm ~ppc ~ppc64" fi @@ -46,7 +46,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) pkg_setup() { linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + !CONFIG_REISER4_FS EFI_PARTITION IOSCHED_NOOP MODULES diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild deleted file mode 100644 index 6de1cb67ef13..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.3.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -if [ ${PV} == "9999" ]; then - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" - inherit git-r3 -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" -fi - -inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" -RESTRICT="debug? ( strip ) test" - -DEPEND=" - =sys-kernel/spl-${PV}* - dev-lang/perl - virtual/awk -" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) - -pkg_setup() { - linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC - EFI_PARTITION - IOSCHED_NOOP - MODULES - !PAX_KERNEXEC_PLUGIN_METHOD_OR - 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 ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 13 || die "Linux 4.13 is the latest supported version."; } - - check_extra_config -} - -src_prepare() { - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - - # Set module revision number - [ ${PV} != "9999" ] && \ - { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; } - - autotools-utils_src_prepare -} - -src_configure() { - local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))" - use custom-cflags || strip-flags - filter-ldflags -Wl,* - - set_arch_to_kernel - local myeconfargs=(${myeconfargs} - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=kernel - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-spl="${EROOT}usr/src/${SPL_PATH}" - --with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}" - $(use_enable debug) - ) - - autotools-utils_src_configure -} - -src_install() { - autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" -} - -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 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 ZFSOnLinux 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 ZFSOnLinux. 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-kmod/zfs-kmod-0.7.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild index 547b4e4ffba0..df70ae1c9a0b 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -10,7 +10,7 @@ if [ ${PV} == "9999" ]; then else SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" S="${WORKDIR}/zfs-${PV}" - KEYWORDS=" ~amd64" + KEYWORDS="~amd64" fi inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils @@ -40,7 +40,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) pkg_setup() { linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + !CONFIG_REISER4_FS EFI_PARTITION IOSCHED_NOOP MODULES diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 3b61376f3877..1b30e443205f 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -40,7 +40,9 @@ DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown ) pkg_setup() { linux-info_pkg_setup - CONFIG_CHECK="!DEBUG_LOCK_ALLOC + CONFIG_CHECK=" + !DEBUG_LOCK_ALLOC + !CONFIG_REISER4_FS EFI_PARTITION IOSCHED_NOOP MODULES |