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 | |
parent | 65737cf14a7220bd9a487aa2af4ae0e79bd23e86 (diff) |
gentoo resync : 10.01.2018
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/Manifest.gz | bin | 22040 -> 22046 bytes | |||
-rw-r--r-- | sys-fs/inotify-tools/Manifest | 2 | ||||
-rw-r--r-- | sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild | 37 | ||||
-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 | ||||
-rw-r--r-- | sys-fs/zfs/Manifest | 10 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-0.6.5.11-r1.ebuild (renamed from sys-fs/zfs/zfs-0.6.5.11.ebuild) | 5 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-0.6.5.4-r3.ebuild (renamed from sys-fs/zfs/zfs-0.6.5.4-r2.ebuild) | 5 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-0.7.3.ebuild | 201 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-0.7.5-r1.ebuild (renamed from sys-fs/zfs/zfs-0.7.5.ebuild) | 5 | ||||
-rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 3 |
15 files changed, 77 insertions, 375 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex 2dd282e10158..3ddc04f21e15 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest index 9805f999ab9a..96f278683fce 100644 --- a/sys-fs/inotify-tools/Manifest +++ b/sys-fs/inotify-tools/Manifest @@ -1,3 +1,5 @@ DIST inotify-tools-3.14.tar.gz 358772 BLAKE2B 99a0b82942d227e3c237edd6ca07bea68a7bbc07fd97bc5d44cb3c07e5e3bfee9513255fe675667872b027f93edd1137c30b61da7c0ef3986994aa812ca74d15 SHA512 6074d510e89bba5da0d7c4d86f2562c662868666ba0a7ea5d73e53c010a0050dd1fc01959b22cffdb9b8a35bd1b0b43c04d02d6f19927520f05889e8a9297dfb +DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2 EBUILD inotify-tools-3.14.ebuild 793 BLAKE2B aa7e944757801932fdacee27abd3026f6eef864048183dc6b6727a33de40c14b1bdf39464f77f41cde7bc0189d08b589f535f0616f6be6ef7eaa67ddafdec62e SHA512 316279c93f1277e74547a4e728847353e11068bcc0fd2fc26b988d9b9c2c0029ac1c7d5e14a0c64eb526312c7e70c1364c2763835402863838987533a39b7044 +EBUILD inotify-tools-3.20.1.ebuild 822 BLAKE2B 335c2dcb495a674a78e1ba6b6085efb597209febc59786c54148972d3e6f7b64946ae5e7bc5255a88e887bc8f2f4b24f6be0f48228bcc8d316bb4f8a1699608a SHA512 347233060efc80213ef7ccb16716505ef267ae4dffd3ee75dee43c32ea854d4da5b01a534ed6a1980713b49f65866a765e251ac6de87c1124a6a07cd48db7cc7 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7 diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild new file mode 100644 index 000000000000..9f5d0f02a1c8 --- /dev/null +++ b/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="a set of command-line programs providing a simple interface to inotify" +HOMEPAGE="https://github.com/rvoicilas/inotify-tools/wiki" +SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~mips ~sparc ~x86" +IUSE="doc" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="" + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # only docs installed are doxygen ones, so use /html + local myeconfargs=( + --docdir='$(datarootdir)'/doc/${PF}/html + $(use_enable doc doxygen) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED%/}" \( -name '*.a*' -o -name '*.la' \) -delete || die +} 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 diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 3f28b754f595..8a6b72de46b1 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -4,11 +4,9 @@ AUX zfs.service.in 334 BLAKE2B 2fee44b71e9fd1b36171fafe9d47c8c1c738923e4127c35cb DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 DIST zfs-0.6.5.4-patches-p2.tar.xz 63912 BLAKE2B f8bd5d0cd2b6170b45cf40a78b484d9a73017b20a77c603f4bcec63b6c77347b07df74c9d53288b5b2b984135d651d3d3ef830395ff2625576b13d8ce433fbcb SHA512 9f598c2a750b92dadddb677a6a9dda4573fa91421a82270d8104d718da4b945a4d5412bab92037a033cec1ec177f2a0eb52207babd023847918e3754054ec5e9 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-0.6.5.11.ebuild 5645 BLAKE2B 939fc7b3c7d04b00be49c5a064f55b7227ea4772279d9b7211bbd0018aa6fcea471fd9badaff5eecbad72a3012b436f91bc76247b6ba336fb9cb59d401a4c983 SHA512 e9b3e733902d0391a2995b8b41a0ece24d3b66dcde640d08e3365af8385ff82a4cc4c9e0114a9ab9a4d6724b282232bb342090ed2aa402233ea0b9c8fccf19c8 -EBUILD zfs-0.6.5.4-r2.ebuild 6707 BLAKE2B 93f5ccc33a740b1162ff47cfea23f51041f0ccf03c7a56da449b27a6ec3d21e180280122fb05ac171f7ad5f0c2036a73dd76c0a6e0dc75b6d0c917d4dfbfade5 SHA512 8fc59acfb83b6e049bcc526f015315247a2450585c030a6ad9636cdbaececeb0def8adfd89087a3d270cc09a79f0d20b610db5de2386c5b72d70db6980b69150 -EBUILD zfs-0.7.3.ebuild 5664 BLAKE2B 2d5e907b5b7189303e1d9a40e50e3b27eec74fc2c78d9979308eed68e2bc4a86926869573336a559c3f7ed2f44abd227c5c3de05b38f7507734eb0fb44f0527c SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 -EBUILD zfs-0.7.5.ebuild 5664 BLAKE2B 2d5e907b5b7189303e1d9a40e50e3b27eec74fc2c78d9979308eed68e2bc4a86926869573336a559c3f7ed2f44abd227c5c3de05b38f7507734eb0fb44f0527c SHA512 bceacbfac5efce785f90d68b3ea35bc3e44e5b7561684d1157842047dd878ae50f43222b473989a4c71380e362b919baf7eba77c28cdfe4bb9c63e425a7e55b9 -EBUILD zfs-9999.ebuild 5805 BLAKE2B 419cff5c68a2e7833360e3e79c00ecaaf48e608db6321b5e824768dac8e7bb216b14636643b8bc45517366121cf4756b3a5432ac5fa523101a01ce5bbda4879b SHA512 3fd1ac15bd72bc98dff861e7860f83d63727aeafa9a35c3d355df9deb4c40009206f18d09794fd26f1fe9702238098452a8ab6fb67d84a5ac84be5776ad10f7a +EBUILD zfs-0.6.5.11-r1.ebuild 5663 BLAKE2B ddc84f8dd2b453f9a6aa9365cd3b051b481b29759cdaa65ed42fb3e5a87b9657ea28699d9ab882f196f063bddfc3105dd512cb8fb23b00244d9032adba8e00f0 SHA512 b5dbd9b04c2c83170ba8509dc9db5117b79e46776d856aac2436485cdc38876b9b393d45b65850699560ec8b58d8fabbf830a1b439a962133f494585492874c4 +EBUILD zfs-0.6.5.4-r3.ebuild 6720 BLAKE2B 910b85a433450e962ddd0e15d97cd03315a22f6c49b6bc7f197804dc31e9da653f44ad0ded0a4b0ad5bb0b6b4d418a52c9f11222ac155ed857ac699784acc6db SHA512 77fd3be6ff8c85025c24e337f4ada686e5cd3f56ce30fe2b898db32c87bf71022910e8e8fa3ea256484e3a52adead57a682b16fb6745c8cd1f2e8ff16df5d20c +EBUILD zfs-0.7.5-r1.ebuild 5682 BLAKE2B 09b0f304e1d0147aa4f1fd6cf1bd0ad9293cd036117aa8d9001c9b94d036ed53529dc77e1088861d9c8f0a86eb3e66e5c6e62a811b30f1fb698e8e808125fdec SHA512 aa5b8430e60c794ea9e7c44e13f218ad2e6d76515960134199a613968627daf58fef75bf54286dfa15137f0bb50ddae724b8d14da50724cca4a9eb3c4955e94e +EBUILD zfs-9999.ebuild 5824 BLAKE2B 14ae69a0209f47bff9f3103dc97c5d41101b22aae3484dc28e59127db687001a3fc3805115de033c907f3cb2aa8f0c84e96663cab5dcd4d6ddd467a94de63b26 SHA512 adb99700a151f0e887de2376394fe4a29a0e79a268dbeb6f99867a27796b60e96848753384de4a5fe4c3fcb5864e03a91d854f867f54ce99d8b348bed9df660a MISC metadata.xml 754 BLAKE2B 7fc8a5badf77174cc9d31bb1e83da53d910a18884897287bc3666066edcfc03ec6331c09cb7ff02767e14b17df03eddba74549feea61dd044c21a4133f4aa763 SHA512 647ffa3857be38b2aed7462d26bbb1d3ea50fc53068b6d973514fdbadf7164421dd2025165a592855b86a03754d968d36e503dcfafc99e3ed75ee7db3f62df3a diff --git a/sys-fs/zfs/zfs-0.6.5.11.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r1.ebuild index 9d6cba3ac805..449cc7656e9c 100644 --- a/sys-fs/zfs/zfs-0.6.5.11.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.11-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" @@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" else SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" + KEYWORDS="~amd64" fi inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev @@ -24,6 +24,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" + net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk diff --git a/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.4-r3.ebuild index 20476c4711d9..07119a758de4 100644 --- a/sys-fs/zfs/zfs-0.6.5.4-r2.ebuild +++ b/sys-fs/zfs/zfs-0.6.5.4-r3.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" @@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" else SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz - https://dev.gentoo.org/~ryao/dist/${P}-patches-p${PR#r}.tar.xz" + https://dev.gentoo.org/~ryao/dist/${P}-patches-p2.tar.xz" KEYWORDS="~amd64 ~arm ~ppc ~ppc64" fi @@ -29,6 +29,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" + net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk diff --git a/sys-fs/zfs/zfs-0.7.3.ebuild b/sys-fs/zfs/zfs-0.7.3.ebuild deleted file mode 100644 index c5bf93725371..000000000000 --- a/sys-fs/zfs/zfs-0.7.3.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -if [ ${PV} == "9999" ] ; then - inherit git-r3 linux-mod - AUTOTOOLS_AUTORECONF="1" - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" -fi - -inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="http://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" -RESTRICT="test" - -COMMON_DEPEND=" - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - test-suite? ( - sys-apps/util-linux - sys-devel/bc - sys-block/parted - sys-fs/lsscsi - sys-fs/mdadm - sys-process/procps - virtual/modutils - ) - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !<sys-boot/grub-2.00-r2:2 - !<sys-kernel/genkernel-3.5.1.1 - !<sys-kernel/genkernel-next-67 - !<sys-kernel/bliss-initramfs-7.1.0 - !<sys-kernel/dracut-044-r1 - ) - sys-fs/udev-init-scripts -" - -AT_M4DIR="config" -AUTOTOOLS_IN_SOURCE_BUILD="1" - -pkg_setup() { - if use kernel_linux && use test-suite; then - linux-info_pkg_setup - if ! linux_config_exists; then - ewarn "Cannot check the linux kernel configuration." - else - # recheck that we don't have usblp to collide with libusb - 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 " [ ] Loopback device support" - fi - fi - fi - fi - -} - -src_prepare() { - # Update paths - sed -e "s|/sbin/lsmod|/bin/lsmod|" \ - -e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ - -e "s|/sbin/parted|/usr/sbin/parted|" \ - -i scripts/common.sh.in - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --sbindir="${EPREFIX}/sbin" - --with-config=user - --with-dracutdir="/usr/$(get_libdir)/dracut" - --with-linux="${KV_DIR}" - --with-linux-obj="${KV_OUT_DIR}" - --with-udevdir="$(get_udevdir)" - --with-blkid - $(use_enable debug) - ) - autotools-utils_src_configure - - # prepare systemd unit and helper script - cat "${FILESDIR}/zfs.service.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs.service" || die - cat "${FILESDIR}/zfs-init.sh.in" | \ - sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \ - -e "s:@sysconfdir@:${EPREFIX}/etc:g" \ - > "${T}/zfs-init.sh" || die -} - -src_install() { - autotools-utils_src_install - gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core - use test-suite || rm -rf "${ED}usr/share/zfs" - - newbashcomp "${FILESDIR}/bash-completion-r1" zfs - bashcomp_alias zfs zpool - - exeinto /usr/libexec - doexe "${T}/zfs-init.sh" - systemd_dounit "${T}/zfs.service" -} - -pkg_postinst() { - 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 [ -e "${EROOT}etc/runlevels/boot/zfs" ] - then - einfo 'The zfs boot script has been split into the zfs-import,' - einfo 'zfs-mount and zfs-share scripts.' - einfo - einfo 'You had the zfs script in your boot runlevel. For your' - einfo 'convenience, it has been automatically removed and the three' - einfo 'scripts that replace it have been configured to start.' - einfo 'The zfs-import and zfs-mount scripts have been added to the boot' - einfo 'runlevel while the zfs-share script is in the default runlevel.' - - rm "${EROOT}etc/runlevels/boot/zfs" - ln -snf "${EROOT}etc/init.d/zfs-import" \ - "${EROOT}etc/runlevels/boot/zfs-import" - ln -snf "${EROOT}etc/init.d/zfs-mount" \ - "${EROOT}etc/runlevels/boot/zfs-mount" - ln -snf "${EROOT}etc/init.d/zfs-share" \ - "${EROOT}etc/runlevels/default/zfs-share" - 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." - fi - - if [ -e "${EROOT}etc/runlevels/default/zed" ] - then - einfo 'The downstream OpenRC zed script has replaced by the upstream' - einfo 'OpenRC zfs-zed script.' - einfo - einfo 'You had the zed script in your default runlevel. For your' - einfo 'convenience, it has been automatically removed and the zfs-zed' - einfo 'script that replaced it has been configured to start.' - - rm "${EROOT}etc/runlevels/boot/zed" - ln -snf "${EROOT}etc/init.d/zfs-sed" \ - "${EROOT}etc/runlevels/default/zfs-zed" - else - [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ - einfo "You should add zfs-zed to the default runlevel." - fi - - if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] - then - einfo "The zfs-shutdown script is obsolete. Removing it from runlevel." - rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" - fi - -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.7.5.ebuild b/sys-fs/zfs/zfs-0.7.5-r1.ebuild index c5bf93725371..596e66352772 100644 --- a/sys-fs/zfs/zfs-0.7.5.ebuild +++ b/sys-fs/zfs/zfs-0.7.5-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" @@ -10,7 +10,7 @@ if [ ${PV} == "9999" ] ; then EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" else SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS=" ~amd64" + KEYWORDS="~amd64" fi inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev @@ -24,6 +24,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" + net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 73df3b10b913..7b8d2f94a45c 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-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" @@ -24,6 +24,7 @@ IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs" RESTRICT="test" COMMON_DEPEND=" + net-libs/libtirpc sys-apps/util-linux[static-libs?] sys-libs/zlib[static-libs(+)?] virtual/awk |