From 7014a5a3ea0feffab9701fdd6b64cc7667a985af Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Jun 2019 17:36:28 +0100 Subject: gentoo resync : 30.06.2019 --- sys-fs/Manifest.gz | Bin 22075 -> 22077 bytes sys-fs/diskdev_cmds/Manifest | 2 +- sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild | 4 +- sys-fs/mac-fdisk/Manifest | 2 +- sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild | 2 +- sys-fs/zfs-kmod/Manifest | 6 - ....0_Fix_integer_overflow_in_get_next_chunk.patch | 32 --- .../zfs-kmod/files/0.8.0_revert_Report_holes.patch | 53 ----- sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild | 146 ------------ sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild | 178 --------------- sys-fs/zfs/Manifest | 4 - sys-fs/zfs/zfs-0.7.12.ebuild | 210 ----------------- sys-fs/zfs/zfs-0.8.0.ebuild | 250 --------------------- 13 files changed, 5 insertions(+), 884 deletions(-) delete mode 100644 sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch delete mode 100644 sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch delete mode 100644 sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild delete mode 100644 sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild delete mode 100644 sys-fs/zfs/zfs-0.7.12.ebuild delete mode 100644 sys-fs/zfs/zfs-0.8.0.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 19eac2018d83..83b84effeafa 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest index b45afe9a629d..714448b975d9 100644 --- a/sys-fs/diskdev_cmds/Manifest +++ b/sys-fs/diskdev_cmds/Manifest @@ -1,5 +1,5 @@ AUX diskdev_cmds-respect-cflags.patch 384 BLAKE2B c4fb56e72868554f8f90841f00a88d4b234ca18b46b9b18f34bcf4b4cf346f97a9c918c975b64753ad97c915c78d5c94329b71e83089856f7b36696fd85d3dca SHA512 db60e9cd8a87fb048f1a97605c578701319c09a370774a7f41cea6d43ded38636796461456a4e1fccac3511f700de9770fb6a4beb7c85e463f23c37f1e3e7afb DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062 -EBUILD diskdev_cmds-332.14_p1.ebuild 1654 BLAKE2B 3e646ab16b11b1f91bf538049ef2a555e2b0ad46f29f5f5f86140c74ba26538eac0182402d12d3a8924d88de89206c0eaf83159d270d7cb0475f2278114ed95e SHA512 4a460db7f3bfbfcf8e747f0df1b4f3c451fafe7abba16cc6423ca6dfc01cd5a31034cf809a3aa90f627ef32d11f22c10beb4289609f58f8a61178d884a064678 +EBUILD diskdev_cmds-332.14_p1.ebuild 1650 BLAKE2B 656d0113e879dfd464fe58987b6fc3ace7d87d9d6d532990af3ff14bdf83bdce57c8dffda0affd0644b72aeec7d4a3201f10e1e7037b9bc912aadc072b3c79be SHA512 64e14df1fe20e00bcd161fca6ab99567236387bb4ab4f21469d8673569471c665f890a326f5c1bdf76c888ea8d27872ce4c407dcad6e2af20fabaf22c8305437 MISC metadata.xml 390 BLAKE2B e64b93c1e1bc559fd8ee2b08df7760111f5e6a16ba5da382a8544fc30f619235b1faf36f3dc34af6db04d55a8e55b8898c5c11648d7f08a0aa2d084fe936a539 SHA512 713593a494fe0722fc1ea9984450a392585e57d2e317d99bbac73a2f713ff87950d52b11124ce2f3c7536755302c364d94ca38389b93789d3af5f5d19d8fc0fa diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild index 0931223de2a3..6b608a1b6315 100644 --- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild +++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=0 @@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}. mirror://gentoo/diskdev_cmds-${PV}.patch.bz2" LICENSE="APSL-2" SLOT="0" -KEYWORDS="amd64 ~arm ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ppc ppc64 x86" IUSE="" DEPEND="dev-libs/openssl" RDEPEND="${DEPEND}" diff --git a/sys-fs/mac-fdisk/Manifest b/sys-fs/mac-fdisk/Manifest index 41a8552d55cd..e893ca4c5689 100644 --- a/sys-fs/mac-fdisk/Manifest +++ b/sys-fs/mac-fdisk/Manifest @@ -12,5 +12,5 @@ DIST mac-fdisk_0.1-18.diff.gz 20267 BLAKE2B 111e5b18c1485b33cfb2f653846e901a528e DIST mac-fdisk_0.1.orig.tar.gz 55817 BLAKE2B d193be6b06be562bcb3297300dc009ac28adba41ea5d7c1a5bc0d16b8f9ec8275e1ad015c9bc529c3aafd12cbd9012e1af7baef7259ce0c8cef4d6dc62986dec SHA512 1263e60a18111162f5ef439b5f9615cef9de94e7836cb998782a6e6d3bcf92a69e49566b33c7330bdea05de5e6ca83f7920c6707f342ce515440160695f07120 EBUILD mac-fdisk-0.1-r7.ebuild 1348 BLAKE2B a0b4d9462e7c45a0cf57c1cd8652a5f3ca42a1d9e50f3c601bcb93e99caa666c34a6567bc34b68b4d0c3395934b34394eb70dff13f7d66efac8d40fd8b7ec83e SHA512 4ef48d9a3ef95d08ac60313c40fd7cfbbb41d42940065cebf1961d7705e4510a25ac5eca7732f948692d6bd861ffd019dd436aa55a7dcdf353c0d5dbc2164988 EBUILD mac-fdisk-0.1_p16.ebuild 1293 BLAKE2B 61dec1a06762c62770735430b474d39007c9832ffa566e43e9f7771ebb7be67d28b53b87954884345acb0f541fa917db8ea652eaf623cc316dc3cd986bf97419 SHA512 e0b81a76399e70dce7ba67490fe5767d7e98f1417fcbad9593710a7dbd77850fdeee9efdcf67c0b01322003a882eb1af10cc38cf343e87e6e0765243d4115330 -EBUILD mac-fdisk-0.1_p18.ebuild 1271 BLAKE2B 948b3961d18a888f1322ae9d2d452199e7d8551468afce530e9981e2fa54a34fcc1d8b98ef7f12e37bca23a60121cd9ab317c1d64ae0208f4c449caa7ba13f22 SHA512 82452c687eaad55c0d1015dec355e245b16f7d769a5fb34c74f5c250644a8c67e23540ec5ba6798c1a239622dd1b58299f626356844ead9ccdd8f66dfb26e852 +EBUILD mac-fdisk-0.1_p18.ebuild 1270 BLAKE2B 78e0a235eed6ec2d1b3f842b0a688db8f15f7f2d96ddfefadc1a9b7a242183be6b87d2dc96c8f1aa8475d44a353653e82518a86cdf3f19dc81631a2c5737da8c SHA512 4f930aa9bd653ed7cdc240c63265efad87560bb91cf4ab20c6c84984240c743da336bd21c59607c7595414304bb18d670bbe1a54230d3f3b95d1ea78bbddde56 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538 diff --git a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild index 908926aa9b73..263a986f35e1 100644 --- a/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild +++ b/sys-fs/mac-fdisk/mac-fdisk-0.1_p18.ebuild @@ -13,7 +13,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86" +KEYWORDS="amd64 ppc ppc64 x86" S=${WORKDIR}/${P/_p*}.orig PATCHES=( diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 4466a019fe06..ea421318b861 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,15 +1,9 @@ -AUX 0.8.0_Fix_integer_overflow_in_get_next_chunk.patch 1223 BLAKE2B d2286ad668d7ee1a80dfc01972cb33d12a189087100dd8f52814fd31475f40624501d0a4e026c8eb2acffac9ccbbca941c0d2edd7b32138f6c2b5682e5d32074 SHA512 89126799f50da5482b13c0b23bf156f06341970d201e19022fe9b067ab955100b91f2775928349f97a03d6d078b3d2ac1f83cd456e172bee8bd2642e9f74a86b -AUX 0.8.0_revert_Report_holes.patch 1344 BLAKE2B 1dfab8f711a821932b213060c8f327406901fa86c5fcab3fc75f7f61d753d506fa75f99b62c3284a2baaa6d3a4efe093db19eed94783aed964b08cd4ed1b757d SHA512 d529fbbbae351cf45dce263ae342aaa5a37f3ce742292b387c39dc0ed378c7ab8d1bb1e302f355adae62ea48074f4bcac14071378e1d365fd4141dd51fff3d41 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 -DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e -DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667 EBUILD zfs-kmod-0.6.5.11.ebuild 4086 BLAKE2B 77042a670913df7a0fbb47e594028d56f6733827192b68ae13b0c52598bf728550b59ef0c850d1498e265765552ba3e6f1e4ea6dd8d8608af3fb994de375135b SHA512 efbc887b8f613a94af230916dd0c6ddbf9fcf29a73d4bfeda19680eb514ad12f75cc75d45f8d01fa56cf909e34e518ec5a91bf70310370dd3cc7db7ab7aa72ef -EBUILD zfs-kmod-0.7.12.ebuild 4072 BLAKE2B bd174bbce39a1634c40ba20c26066e15c660b18382f6c2c7ada46759fa19339e39e2490e209f319cf80041151c074aaeb86c456441fdf814e46a6a3a37c2316f SHA512 1a52bec71a66de3cb79ab32e68b95ae6a0590a8acb715e4a025516840d8a21252e524a25044897661c2977217a6ec7bbc6da1e60846dcf414f97324bbc564ee2 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340 EBUILD zfs-kmod-0.7.9999.ebuild 4131 BLAKE2B 10f0553102967537d42f5b2da8ede7c8894ca9134a1421efadd1db538b3381d588fe6729dc37c84ab025212ca01a74c2e60768fe8f7808acbd21f0179b2a9abb SHA512 ad59815b9e2ce844e6caa5232d1e4f17c70b930b8295a28e44f37b8293c602fb8b98f939bb1ea22cef68c8e724de6a581b09073d41fd7a14aa181a0cadb6250c -EBUILD zfs-kmod-0.8.0-r1.ebuild 4455 BLAKE2B a46c12e4547b5ad0564cd43fd63af6f646ab21f4cb7ec581a09c3c91bef6901321f10b92c4048de072ed6a3bdfcb36827c2189a04e63f86a4e9243adddb457ee SHA512 9ad94fff5362229432c5d817dfea53a9e17311d7caa7e6b6966de906b1020e393d841ffc277ec4a40d7e9b4a961c80bcfd8a5467557a6a5f69db61d9b2952421 EBUILD zfs-kmod-0.8.1.ebuild 4383 BLAKE2B 0647118185faaf5a17423e8a24811fbdf7cc3eb01a412632e7ab9610fea23c9a7c85f7cb21b6187b651d895ac4d00c4a6e795c38fd7d49bbee7784b514355191 SHA512 a87e77f261462f720f5c8e64fd04a8f6ea4cec1fe71c242aa06c9da88272e95c4509645a1f4afd518889624815e203cd07a441454d190109ec3ce6eabe0ca357 EBUILD zfs-kmod-9999.ebuild 4383 BLAKE2B 0647118185faaf5a17423e8a24811fbdf7cc3eb01a412632e7ab9610fea23c9a7c85f7cb21b6187b651d895ac4d00c4a6e795c38fd7d49bbee7784b514355191 SHA512 a87e77f261462f720f5c8e64fd04a8f6ea4cec1fe71c242aa06c9da88272e95c4509645a1f4afd518889624815e203cd07a441454d190109ec3ce6eabe0ca357 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch b/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch deleted file mode 100644 index 0042bfdc99c4..000000000000 --- a/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ec4afd27f198d93a7bd32a05cb288708ba754ada Mon Sep 17 00:00:00 2001 -From: madz -Date: Wed, 29 May 2019 19:17:25 +0200 -Subject: [PATCH] Fix integer overflow in get_next_chunk() - -dn->dn_datablksz type is uint32_t and need to be casted to uint64_t -to avoid an overflow when the record size is greater than 4 MiB. - -Reviewed-by: Tom Caputi -Reviewed-by: Brian Behlendorf -Signed-off-by: Olivier Mazouffre -Closes #8778 -Closes #8797 ---- - module/zfs/dmu.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c -index 1697a632078..a283b062238 100644 ---- a/module/zfs/dmu.c -+++ b/module/zfs/dmu.c -@@ -719,8 +719,8 @@ get_next_chunk(dnode_t *dn, uint64_t *start, uint64_t minimum, uint64_t *l1blks) - uint64_t blks; - uint64_t maxblks = DMU_MAX_ACCESS >> (dn->dn_indblkshift + 1); - /* bytes of data covered by a level-1 indirect block */ -- uint64_t iblkrange = -- dn->dn_datablksz * EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT); -+ uint64_t iblkrange = (uint64_t)dn->dn_datablksz * -+ EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT); - - ASSERT3U(minimum, <=, *start); - diff --git a/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch b/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch deleted file mode 100644 index f8d67ccc7cef..000000000000 --- a/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch +++ /dev/null @@ -1,53 +0,0 @@ -From: Georgy Yakovlev -Date: Wed, 29 May 2019 14:38:15 -0700 -Subject: Revert [PATCH] Report holes when there are only metadata changes - -This reverts ec4f9b8f30391a3fb46c8d4a31c2dc9250dca1bb -Issue: https://github.com/zfsonlinux/zfs/issues/8816 -Bug: https://bugs.gentoo.org/635002 ---- ---- b/module/zfs/dmu.c -+++ a/module/zfs/dmu.c -@@ -2366,39 +2366,14 @@ - return (err); - - /* -+ * Check if dnode is dirty -- * Check if there are dirty data blocks or frees which have not been -- * synced. Dirty spill and bonus blocks which are external to the -- * object can ignored when reporting holes. - */ -- mutex_enter(&dn->dn_mtx); - for (i = 0; i < TXG_SIZE; i++) { - if (multilist_link_active(&dn->dn_dirty_link[i])) { -+ clean = B_FALSE; -+ break; -- -- if (dn->dn_free_ranges[i] != NULL) { -- clean = B_FALSE; -- break; -- } -- -- list_t *list = &dn->dn_dirty_records[i]; -- dbuf_dirty_record_t *dr; -- -- for (dr = list_head(list); dr != NULL; -- dr = list_next(list, dr)) { -- dmu_buf_impl_t *db = dr->dr_dbuf; -- -- if (db->db_blkid == DMU_SPILL_BLKID || -- db->db_blkid == DMU_BONUS_BLKID) -- continue; -- -- clean = B_FALSE; -- break; -- } - } -- -- if (clean == B_FALSE) -- break; - } -- mutex_exit(&dn->dn_mtx); - - /* - * If compatibility option is on, sync any current changes before diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild deleted file mode 100644 index 852906e68ad6..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.12.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="https://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 - !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 ge 2 6 32 || die "Linux 2.6.32 or newer required" - - [ ${PV} != "9999" ] && \ - { kernel_is le 4 19 || die "Linux 4.19 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.8.0-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild deleted file mode 100644 index 0108a7a9b3b7..000000000000 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic linux-info linux-mod toolchain-funcs - -DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs" -HOMEPAGE="https://zfsonlinux.org/" - -if [[ ${PV} == "9999" ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz" - KEYWORDS="~amd64" - S="${WORKDIR}/zfs-${PV}" - ZFS_KERNEL_COMPAT="5.1" -fi - -LICENSE="CDDL debug? ( GPL-2+ )" -SLOT="0" -IUSE="custom-cflags debug +rootfs" - -DEPEND="" - -RDEPEND="${DEPEND} - !sys-fs/zfs-fuse - !sys-kernel/spl -" - -BDEPEND=" - dev-lang/perl - virtual/awk -" - -RESTRICT="debug? ( strip ) test" - -DOCS=( AUTHORS COPYRIGHT META README.md ) - -PATCHES=( - "${FILESDIR}"/0.8.0_revert_Report_holes.patch - "${FILESDIR}"/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch -) - -pkg_setup() { - linux-info_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" - - kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required" - - 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 - - check_extra_config -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # Set module revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - # Remove GPLv2-licensed ZPIOS unless we are debugging - use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in -} - -src_configure() { - set_arch_to_kernel - - use custom-cflags || strip-flags - - filter-ldflags -Wl,* - - local myconf=( - --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=( V=1 ) - - emake "${myemakeargs[@]}" -} - -src_install() { - set_arch_to_kernel - - myemakeargs+=( - DEPMOD="/bin/true" - DESTDIR="${D}" - INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" - ) - - emake "${myemakeargs[@]}" install - - einstalldocs -} - -pkg_postinst() { - linux-mod_pkg_postinst - - # Remove old modules - if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then - ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs" - ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs" - ewarn "Automatically removing old modules to avoid problems." - rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules" - rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon" - fi - - if 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/Manifest b/sys-fs/zfs/Manifest index b7f25ad667bd..c59801eb606c 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -3,15 +3,11 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451 -DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e -DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667 EBUILD zfs-0.6.5.11-r2.ebuild 6063 BLAKE2B dfeb1cb507428711a7aabb08a1a25deb4cabde7a66a7c6708634a7a6919b7a8e009d4f33870d1461b76985866547357c5cd2731ebec6bedc3219c4758bac54b0 SHA512 c4506ebd3be9c6e3037dca9d600f9e964c77b0b15fd554f5e7463136a7f98778d04c477a9a6fc1ae6feb2f54bf9c3968c26167bd45a32d1c0f117f8eb53d3e07 -EBUILD zfs-0.7.12.ebuild 6076 BLAKE2B c26271d1252a199e93b20868f962582864d2b50f102efb046fc0c4b3ad26ef5dc552d6b043979eb5c757889e671210bee202fe71453dc2e16dcf00592884fe8d SHA512 2cc0d649737fbed063bb57ac1eaa25669ad7098b477009f8b0b9507ce3c5c9ff1f0c2ded2c5ea348a84e03413c0c2035fd76dbe17f2a0d755876a792d9796f70 EBUILD zfs-0.7.13.ebuild 6273 BLAKE2B 2bc2247efd975f46320d964c71764a4382255b1acd37d94d1f800f1ae9e7fd06d08fae70b574189136ae373723d505b49ba9ad1ac033aada5ba178bbb1b8d9fc SHA512 bdec6a25dc8d7c9f41ea7c3d505e6e6ba4ead69393826432ff24b898b16d99a0a023469cf932c3c4e86f1641f3192c8110362a7603ec06ec34266c0dc9b19b08 EBUILD zfs-0.7.9999.ebuild 5973 BLAKE2B 521149bd89635e86c8fc2dd3b3bbc3cc85ec3c79a4ab372910984abd75fbec617080503074da5dff34064807fc9a1cfdfd4946406c4aa6b9e1e6a478db6f6e33 SHA512 90914f61584760f399dcc6eb84995adbb3e31e22dc6a1aa0da2996f854362e8f5d99a73ad1270a6d01fa73e5327c0b04582ec2256ceb623bb62a7d1606de210a -EBUILD zfs-0.8.0.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200 EBUILD zfs-0.8.1.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200 EBUILD zfs-9999.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295 diff --git a/sys-fs/zfs/zfs-0.7.12.ebuild b/sys-fs/zfs/zfs-0.7.12.ebuild deleted file mode 100644 index 2d1df0a92e3d..000000000000 --- a/sys-fs/zfs/zfs-0.7.12.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -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="https://zfsonlinux.org/" - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -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 -" -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 - !" - 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 || die - - autotools-utils_src_prepare -} - -src_configure() { - use custom-cflags || strip-flags - local myeconfargs=( - --bindir="${EPREFIX}/bin" - --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-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - $(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 - - systemd_reenable zfs-zed.service - systemd_reenable zfs-import-cache.service - systemd_reenable zfs-import-scan.service - systemd_reenable zfs-mount.service - systemd_reenable zfs-share.service - systemd_reenable zfs-import.target - systemd_reenable zfs.target - systemd_reenable zfs.service -} - -pkg_postrm() { - if ! use kernel-builtin && [ ${PV} = "9999" ] - then - remove_moduledb - fi -} diff --git a/sys-fs/zfs/zfs-0.8.0.ebuild b/sys-fs/zfs/zfs-0.8.0.ebuild deleted file mode 100644 index 129f34845447..000000000000 --- a/sys-fs/zfs/zfs-0.8.0.ebuild +++ /dev/null @@ -1,250 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) - -inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev - -DESCRIPTION="Userland utilities for ZFS Linux kernel module" -HOMEPAGE="https://zfsonlinux.org/" - -if [[ ${PV} == "9999" ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" -else - SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz" - KEYWORDS="~amd64" -fi - -LICENSE="BSD-2 CDDL MIT" -SLOT="0" -IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs" - -COMMON_DEPEND=" - ${PYTHON_DEPS} - net-libs/libtirpc - sys-apps/util-linux[static-libs?] - sys-libs/zlib[static-libs(+)?] - virtual/awk - python? ( - virtual/python-cffi[${PYTHON_USEDEP}] - ) -" - -BDEPEND="${COMMON_DEPEND} - virtual/pkgconfig - python? ( - dev-python/setuptools[${PYTHON_USEDEP}] - ) -" - -RDEPEND="${COMMON_DEPEND} - !=sys-apps/grep-2.13* - !kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} ) - !sys-fs/zfs-fuse - !prefix? ( virtual/udev ) - sys-fs/udev-init-scripts - rootfs? ( - app-arch/cpio - app-misc/pax-utils - !" - eerror " Block devices --->" - eerror " [X] Loopback device support" - fi - fi - fi - fi -} - -src_prepare() { - default - - if [[ ${PV} == "9999" ]]; then - eautoreconf - else - # Set revision number - sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release" - fi - - # 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 || die - - if use python; then - pushd contrib/pyzfs >/dev/null || die - distutils-r1_src_prepare - popd >/dev/null || die - fi -} - -src_configure() { - use custom-cflags || strip-flags - - local myconf=( - --bindir="${EPREFIX}/bin" - --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-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" - $(use_enable debug) - $(use_enable python pyzfs) - ) - - 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 uutil nvpair zpool zfs zfs_core - - use test-suite || rm -rf "${ED}/usr/share/zfs" - - 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 - python_setup - python_fix_shebang "${ED}/bin" -} - -pkg_postinst() { - if has_version "<=sys-kernel/genkernel-3.5.3.3"; then - einfo "genkernel version 3.5.3.3 and earlier does NOT support" - einfo " unlocking pools with native zfs encryption enabled at boot" - einfo " use dracut or genkernel-9999 if you requre this functionality" - 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 [[ -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-zed" \ - "${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 - - systemd_reenable zfs-zed.service - systemd_reenable zfs-import-cache.service - systemd_reenable zfs-import-scan.service - systemd_reenable zfs-mount.service - systemd_reenable zfs-share.service - systemd_reenable zfs-import.target - systemd_reenable zfs.target -} - -pkg_postrm() { - if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then - remove_moduledb - fi -} -- cgit v1.2.3