| 1 |
commit: 735cf46fa78ec87d35db9a6eb1256b3489d89d29 |
| 2 |
Author: Richard Yao <ryao <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 1 04:12:11 2015 +0000 |
| 4 |
Commit: Richard Yao <ryao <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 04:29:48 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=735cf46f |
| 7 |
|
| 8 |
sys-fs/zfs and friends: bump to 0.6.5.2 |
| 9 |
|
| 10 |
Upstream release notes: |
| 11 |
|
| 12 |
https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.2 |
| 13 |
|
| 14 |
Some additional improvements were made to the ebuilds in this bump. |
| 15 |
|
| 16 |
1. The incorrect requirement on BLK_DEV_LOOP was removed from sys-fs/zfs-kmod |
| 17 |
in favor of a cups ebuild style warning in sys-fs/zfs when BLK_DEV_LOOP is not |
| 18 |
avaliable and the test suite has been installed. |
| 19 |
|
| 20 |
2. The regression where we remove the dracut module has been fixed. |
| 21 |
|
| 22 |
3. The failure to migrate users to the zfs-zed script from the zed script has |
| 23 |
been fixed. |
| 24 |
|
| 25 |
4. The 9999 ebuilds have been synchronized with the 0.6.5.2 ebuilds. |
| 26 |
|
| 27 |
5. The sys-fs/zfs-kmod-0.6.5 has been removed due to the regression that |
| 28 |
prompted sys-fs/zfs-kmod-0.6.5-r1. |
| 29 |
|
| 30 |
Package-Manager: portage-2.2.20.1 |
| 31 |
Signed-off-by: Richard Yao <ryao <AT> gentoo.org> |
| 32 |
|
| 33 |
sys-fs/zfs-kmod/Manifest | 1 + |
| 34 |
...s-kmod-0.6.5.ebuild => zfs-kmod-0.6.5.2.ebuild} | 3 +- |
| 35 |
sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 35 +++++---- |
| 36 |
sys-fs/zfs/Manifest | 1 + |
| 37 |
sys-fs/zfs/{zfs-9999.ebuild => zfs-0.6.5.2.ebuild} | 85 +++++++++++++++++----- |
| 38 |
sys-fs/zfs/zfs-9999.ebuild | 85 +++++++++++++++++----- |
| 39 |
sys-kernel/spl/Manifest | 1 + |
| 40 |
.../spl/{spl-9999.ebuild => spl-0.6.5.2.ebuild} | 11 +-- |
| 41 |
sys-kernel/spl/spl-9999.ebuild | 11 +-- |
| 42 |
9 files changed, 170 insertions(+), 63 deletions(-) |
| 43 |
|
| 44 |
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest |
| 45 |
index 6112879..a3e609f 100644 |
| 46 |
--- a/sys-fs/zfs-kmod/Manifest |
| 47 |
+++ b/sys-fs/zfs-kmod/Manifest |
| 48 |
@@ -6,6 +6,7 @@ DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f |
| 49 |
DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe |
| 50 |
DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1 |
| 51 |
DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f37aaaa1fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1 |
| 52 |
+DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634 |
| 53 |
DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24 |
| 54 |
DIST zfs-kmod-0.6.2-p2.tar.xz 28636 SHA256 12882463a38a5a57cf2bb3c14c5783f9511f6dc7b163a47575f2f3dcc24f26f6 SHA512 5792660ae8f5013d12e70d608e9cffa92a8c4089a88a5e78728ee88204b3f970d452d5b0b3874e02be49ebbc139e07139be7b5a86ca40bc8b23cb11a7198a9a8 WHIRLPOOL 0e4c57b363cdd3d736efbd1355567b18e22439bd3b20ef40b27f6b97ad4570c7cc99a11b196ac25359d1966c1a70e178f4fd1687b60450f148ccda47b07282a9 |
| 55 |
DIST zfs-kmod-0.6.2-p3.tar.xz 45988 SHA256 4af06d1472f5d24e01d147b6fec5c78fbbd9739d1259bd3fbf57af66c99b9bcb SHA512 eddf67c0aa49d42f663f98dc721bac75e8d0521df5ae174cd6aeee0a935a71b49e06961404eb6c71a09cd239358868a2fe49de4f1d26776948f8fe7fc943165c WHIRLPOOL 5634a92f6f322f67edef95ad121b0b1699e520ca8beb05b3385dc7e20198dd45d337731bf7df69d1b1c552ed0b78d54b15bc9c9e76b694ae4c8d360892b9d764 |
| 56 |
|
| 57 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild |
| 58 |
similarity index 98% |
| 59 |
rename from sys-fs/zfs-kmod/zfs-kmod-0.6.5.ebuild |
| 60 |
rename to sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild |
| 61 |
index dd565a4..2876e3b 100644 |
| 62 |
--- a/sys-fs/zfs-kmod/zfs-kmod-0.6.5.ebuild |
| 63 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.6.5.2.ebuild |
| 64 |
@@ -41,7 +41,6 @@ RDEPEND="${DEPEND} |
| 65 |
pkg_setup() { |
| 66 |
linux-info_pkg_setup |
| 67 |
CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
| 68 |
- BLK_DEV_LOOP |
| 69 |
EFI_PARTITION |
| 70 |
IOSCHED_NOOP |
| 71 |
MODULES |
| 72 |
@@ -66,7 +65,7 @@ pkg_setup() { |
| 73 |
kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
| 74 |
|
| 75 |
[ ${PV} != "9999" ] && \ |
| 76 |
- { kernel_is le 4 2 || die "Linux 4.2 is the latest supported version."; } |
| 77 |
+ { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } |
| 78 |
|
| 79 |
check_extra_config |
| 80 |
} |
| 81 |
|
| 82 |
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
| 83 |
index 50318f9..2876e3b 100644 |
| 84 |
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
| 85 |
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild |
| 86 |
@@ -12,13 +12,11 @@ inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils |
| 87 |
|
| 88 |
if [ ${PV} == "9999" ] ; then |
| 89 |
inherit git-2 |
| 90 |
- MY_PV=9999 |
| 91 |
EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git" |
| 92 |
else |
| 93 |
inherit eutils versionator |
| 94 |
- MY_PV=$(replace_version_separator 3 '-') |
| 95 |
- SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz" |
| 96 |
- S="${WORKDIR}/zfs-zfs-${MY_PV}" |
| 97 |
+ SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${PV}.tar.gz" |
| 98 |
+ S="${WORKDIR}/zfs-zfs-${PV}" |
| 99 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
| 100 |
fi |
| 101 |
|
| 102 |
@@ -43,7 +41,6 @@ RDEPEND="${DEPEND} |
| 103 |
pkg_setup() { |
| 104 |
linux-info_pkg_setup |
| 105 |
CONFIG_CHECK="!DEBUG_LOCK_ALLOC |
| 106 |
- BLK_DEV_LOOP |
| 107 |
EFI_PARTITION |
| 108 |
IOSCHED_NOOP |
| 109 |
MODULES |
| 110 |
@@ -65,10 +62,10 @@ pkg_setup() { |
| 111 |
DEVTMPFS |
| 112 |
" |
| 113 |
|
| 114 |
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
| 115 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
| 116 |
|
| 117 |
[ ${PV} != "9999" ] && \ |
| 118 |
- { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; } |
| 119 |
+ { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } |
| 120 |
|
| 121 |
check_extra_config |
| 122 |
} |
| 123 |
@@ -128,10 +125,22 @@ pkg_postinst() { |
| 124 |
ewarn "at least 256M and decreasing zfs_arc_max to some value less than that." |
| 125 |
fi |
| 126 |
|
| 127 |
- ewarn "This version of ZFSOnLinux includes support for features flags." |
| 128 |
- ewarn "If you upgrade your pools to make use of feature flags, you will lose" |
| 129 |
- ewarn "the ability to import them using older versions of ZFSOnLinux." |
| 130 |
- ewarn "Any new pools will be created with feature flag support and will" |
| 131 |
- ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" |
| 132 |
- ewarn "pool that is backward compatible, use zpool create -o version=28 ..." |
| 133 |
+ ewarn "This version of ZFSOnLinux includes support for new feature flags" |
| 134 |
+ ewarn "that are incompatible with previous versions. GRUB2 support for" |
| 135 |
+ ewarn "/boot with the new feature flags is not yet available." |
| 136 |
+ ewarn "Do *NOT* upgrade root pools to use the new feature flags." |
| 137 |
+ ewarn "Any new pools will be created with the new feature flags by default" |
| 138 |
+ ewarn "and will not be compatible with older versions of ZFSOnLinux. To" |
| 139 |
+ ewarn "create a newpool that is backward compatible wih GRUB2, use " |
| 140 |
+ ewarn |
| 141 |
+ ewarn "zpool create -d -o feature@async_destroy=enabled " |
| 142 |
+ ewarn " -o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled" |
| 143 |
+ ewarn " -o feature@spacemap_histogram=enabled" |
| 144 |
+ ewarn " -o feature@enabled_txg=enabled " |
| 145 |
+ ewarn " -o feature@extensible_dataset=enabled -o feature@bookmarks=enabled" |
| 146 |
+ ewarn " ..." |
| 147 |
+ ewarn |
| 148 |
+ ewarn "GRUB2 support will be updated as soon as either the GRUB2" |
| 149 |
+ ewarn "developers do a tag or the Gentoo developers find time to backport" |
| 150 |
+ ewarn "support from GRUB2 HEAD." |
| 151 |
} |
| 152 |
|
| 153 |
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest |
| 154 |
index fbe195e..9294320 100644 |
| 155 |
--- a/sys-fs/zfs/Manifest |
| 156 |
+++ b/sys-fs/zfs/Manifest |
| 157 |
@@ -6,6 +6,7 @@ DIST zfs-0.6.3-patches-r1.tar.xz 87852 SHA256 71b5286f77cb6a6c2b97cee406dfd4788f |
| 158 |
DIST zfs-0.6.3.tar.gz 1665270 SHA256 00caeae63cc724d3dd741aeb36fd2dc03d2158794bd6a5e925cdc8d7e5d3da8c SHA512 8c7741f5f227eb031d79fe87bf7d60e790a098fa6caede462d556c97d798832f97f5a377cbb74fc99b8d198e5f3cc1a3491f69fcdaa0408933dbadd132013416 WHIRLPOOL db9791da12c441c89667b194154b209f5aa69ea46d5327cfcde0b3a910cf1f0e5ca448909824e45b31252a1907280b711fb6ba04eb313d09de0ffbf5e6e304fe |
| 159 |
DIST zfs-0.6.4.2.tar.gz 1738601 SHA256 26af2924cbb891b79203a31827cba4cdc310162d5f7b9e2d643eb6576aa19015 SHA512 87a28997b8f9d36e189410171db583402418a55782b7b7f333993e98c5e17ccc4b6cd5825f38b904294c87e3dfdfb7748bd71cc371589c1358f16c942e0c18db WHIRLPOOL 1700de7da56311a7b608c99a821e2fa97a6145ccc88f3d8eff12f778421ba7b7b9cc5f5fbe5f1acd2ea2fd1db778c200a2ea961e3859a8fc89d80474894293f1 |
| 160 |
DIST zfs-0.6.4.tar.gz 1735736 SHA256 7f37aaaa1fc15201dde58bb84e0f191ccac462f19ffec0c889b6f6ed3f73a804 SHA512 cf47cbf5fa8dff75f5e9d81b323f5745d7b210266ba9e6ccab16bbf0e2b055aa1168bad94a77a4bc56c6fbe0391593f210bd4c74f7a8d0d99385ac4dd61e5622 WHIRLPOOL 1b0cc8a9727b57f2e63bd106cd94780002a068b31668b9dc103dbc0b48858a380d7c228f39f0526fc84b9d10aca1bd376ace0346a2ef4306a9d164c2d56606f1 |
| 161 |
+DIST zfs-0.6.5.2.tar.gz 1817267 SHA256 aecd2bc5189f2a71a45eb222230146bed231af4f35af5ec7af83a74987c3d595 SHA512 7f0b20feca91d5ab952c1d49ae94d241f8868825b163a3d5f2ad0fd7adcac3ab246a3e6a755019a833be553fbbfd6609828d8123f49a43b42bf76cfd64f234ec WHIRLPOOL 00fd628ef2267366b6f0705e6436ac55b260aabc3588c7f58a7042dfbfe95a0478740b4579326638d28f10ffc8f2d5b3ed21b9f8297e72344ec439fe30310634 |
| 162 |
DIST zfs-0.6.5.tar.gz 1816180 SHA256 542121940122c922c9d21a2bb39bca4e4a9db2f6bbfd2e576630840e256d4c82 SHA512 58480ee9b0780f1f21d12504abc226be3e6df1939214f6a8f245315d1fa0b9da56b3a744df26426ee78f13684a4ca288df6dddc50f8f91d9d0b4c542980a9c53 WHIRLPOOL fdb5580ec8d4abe57069ce453c1d91225019758ecf5d31856a7897ac7e4b51c6a8ae3258e822f684fbd70a0a7d7410c65c37a569f37d132767522118c587cc24 |
| 163 |
DIST zfs-kmod-0.6.2-p0.tar.xz 8244 SHA256 84456e1d52c6d44cc377d131ee34c042c289d00f74e7a9b521d8ef82bdfcf369 SHA512 ff29830e44aeb537d82d2c34070a245271b51013131f9191d03ab35eff2b86559c4bdadd3cf21f7aa7bec07c3556ef712db9cca2beedd1288036c29d750567e2 WHIRLPOOL 62b9a920a832f5715a24c2a0cdc914a5e77700b0e8723df868b1bf8b8a7ecec6f7df14cb294dfb4f4f219cc8253615c594b609a117b57b576e1796b8042bfdc5 |
| 164 |
DIST zfs-kmod-0.6.2-p1.tar.xz 15988 SHA256 0d5ee6d53f6ba694937a9c1f009a0c18519e56cfcd328e5a42a0486f967608e5 SHA512 77b4f167073fa1be2501889f6795972a370c90b58dca121c95c38d98b37fa092ad043e5ab447e677f2207da7119b9fd2c940990bec83118edf18daff2eccaa16 WHIRLPOOL 730347f5d6c7449f309f6b53cdbcbb77b94c35385cebdb5a953f851f01d26c87d615b8ef673a7346f8351e01237833e18ed2fc7cca78bb200e7537222b3e46e2 |
| 165 |
|
| 166 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-0.6.5.2.ebuild |
| 167 |
similarity index 53% |
| 168 |
copy from sys-fs/zfs/zfs-9999.ebuild |
| 169 |
copy to sys-fs/zfs/zfs-0.6.5.2.ebuild |
| 170 |
index 0bb7b67..54dd341 100644 |
| 171 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 172 |
+++ b/sys-fs/zfs/zfs-0.6.5.2.ebuild |
| 173 |
@@ -5,7 +5,7 @@ |
| 174 |
EAPI="5" |
| 175 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
| 176 |
|
| 177 |
-inherit python-r1 |
| 178 |
+inherit python-r1 linux-info |
| 179 |
|
| 180 |
AT_M4DIR="config" |
| 181 |
AUTOTOOLS_AUTORECONF="1" |
| 182 |
@@ -13,13 +13,11 @@ AUTOTOOLS_IN_SOURCE_BUILD="1" |
| 183 |
|
| 184 |
if [ ${PV} == "9999" ] ; then |
| 185 |
inherit git-2 linux-mod |
| 186 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
| 187 |
+ EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
| 188 |
else |
| 189 |
inherit eutils versionator |
| 190 |
- MY_PV=$(replace_version_separator 3 '-') |
| 191 |
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz |
| 192 |
- https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p2.tar.xz" |
| 193 |
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
| 194 |
+ SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" |
| 195 |
+ S="${WORKDIR}/${PN}-${P}" |
| 196 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
| 197 |
fi |
| 198 |
|
| 199 |
@@ -61,21 +59,33 @@ RDEPEND="${COMMON_DEPEND} |
| 200 |
app-misc/pax-utils |
| 201 |
!<sys-boot/grub-2.00-r2:2 |
| 202 |
) |
| 203 |
+ !>=sys-fs/udev-init-scripts-28 |
| 204 |
" |
| 205 |
|
| 206 |
pkg_setup() { |
| 207 |
- : |
| 208 |
+ if use kernel_linux; then |
| 209 |
+ linux-info_pkg_setup |
| 210 |
+ if ! linux_config_exists; then |
| 211 |
+ ewarn "Cannot check the linux kernel configuration." |
| 212 |
+ else |
| 213 |
+ # recheck that we don't have usblp to collide with libusb |
| 214 |
+ if use test-suite; then |
| 215 |
+ if linux_chkconfig_present BLK_DEV_LOOP; then |
| 216 |
+ eerror "The ZFS test suite requires loop device support enabled." |
| 217 |
+ eerror "Please enable it:" |
| 218 |
+ eerror " CONFIG_BLK_DEV_LOOP=y" |
| 219 |
+ eerror "in /usr/src/linux/.config or" |
| 220 |
+ eerror " Device Drivers --->" |
| 221 |
+ eerror " Block devices --->" |
| 222 |
+ eerror " [ ] Loopback device support" |
| 223 |
+ fi |
| 224 |
+ fi |
| 225 |
+ fi |
| 226 |
+ fi |
| 227 |
+ |
| 228 |
} |
| 229 |
|
| 230 |
src_prepare() { |
| 231 |
- if [ ${PV} != "9999" ] |
| 232 |
- then |
| 233 |
- # Apply patch set |
| 234 |
- EPATCH_SUFFIX="patch" \ |
| 235 |
- EPATCH_FORCE="yes" \ |
| 236 |
- epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches" |
| 237 |
- fi |
| 238 |
- |
| 239 |
# Update paths |
| 240 |
sed -e "s|/sbin/lsmod|/bin/lsmod|" \ |
| 241 |
-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ |
| 242 |
@@ -132,8 +142,49 @@ pkg_postinst() { |
| 243 |
update_moduledb |
| 244 |
fi |
| 245 |
|
| 246 |
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ |
| 247 |
- || ewarn 'You should add zfs to the boot runlevel.' |
| 248 |
+ if [ -e "${EROOT}etc/runlevels/boot/zfs" ] |
| 249 |
+ then |
| 250 |
+ einfo 'The zfs boot script has been split into the zfs-import,' |
| 251 |
+ einfo 'zfs-mount and zfs-share scripts.' |
| 252 |
+ einfo |
| 253 |
+ einfo 'You had the zfs script in your boot runlevel. For your' |
| 254 |
+ einfo 'convenience, it has been automatically removed and the three' |
| 255 |
+ einfo 'scripts that replace it have been configured to start.' |
| 256 |
+ einfo 'The zfs-import and zfs-mount scripts have been added to the boot' |
| 257 |
+ einfo 'runlevel while the zfs-share script is in the default runlevel.' |
| 258 |
+ |
| 259 |
+ rm "${EROOT}etc/runlevels/boot/zfs" |
| 260 |
+ ln -snf "${EROOT}etc/init.d/zfs-import" \ |
| 261 |
+ "${EROOT}etc/runlevels/boot/zfs-import" |
| 262 |
+ ln -snf "${EROOT}etc/init.d/zfs-mount" \ |
| 263 |
+ "${EROOT}etc/runlevels/boot/zfs-mount" |
| 264 |
+ ln -snf "${EROOT}etc/init.d/zfs-share" \ |
| 265 |
+ "${EROOT}etc/runlevels/default/zfs-share" |
| 266 |
+ else |
| 267 |
+ [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ |
| 268 |
+ einfo "You should add zfs-import to the boot runlevel." |
| 269 |
+ [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ |
| 270 |
+ einfo "You should add zfs-mount to the boot runlevel." |
| 271 |
+ [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ |
| 272 |
+ einfo "You should add zfs-share to the default runlevel." |
| 273 |
+ fi |
| 274 |
+ |
| 275 |
+ if [ -e "${EROOT}etc/runlevels/default/zed" ] |
| 276 |
+ then |
| 277 |
+ einfo 'The downstream OpenRC zed script has replaced by the upstream' |
| 278 |
+ einfo 'OpenRC zfs-zed script.' |
| 279 |
+ einfo |
| 280 |
+ einfo 'You had the zed script in your default runlevel. For your' |
| 281 |
+ einfo 'convenience, it has been automatically removed and the zfs-zed' |
| 282 |
+ einfo 'script that replaced it has been configured to start.' |
| 283 |
+ |
| 284 |
+ rm "${EROOT}etc/runlevels/boot/zed" |
| 285 |
+ ln -snf "${EROOT}etc/init.d/zfs-sed" \ |
| 286 |
+ "${EROOT}etc/runlevels/default/zfs-zed" |
| 287 |
+ else |
| 288 |
+ [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ |
| 289 |
+ einfo "You should add zfs-zed to the default runlevel." |
| 290 |
+ fi |
| 291 |
|
| 292 |
if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] |
| 293 |
then |
| 294 |
|
| 295 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 296 |
index 0bb7b67..54dd341 100644 |
| 297 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 298 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 299 |
@@ -5,7 +5,7 @@ |
| 300 |
EAPI="5" |
| 301 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
| 302 |
|
| 303 |
-inherit python-r1 |
| 304 |
+inherit python-r1 linux-info |
| 305 |
|
| 306 |
AT_M4DIR="config" |
| 307 |
AUTOTOOLS_AUTORECONF="1" |
| 308 |
@@ -13,13 +13,11 @@ AUTOTOOLS_IN_SOURCE_BUILD="1" |
| 309 |
|
| 310 |
if [ ${PV} == "9999" ] ; then |
| 311 |
inherit git-2 linux-mod |
| 312 |
- EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
| 313 |
+ EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
| 314 |
else |
| 315 |
inherit eutils versionator |
| 316 |
- MY_PV=$(replace_version_separator 3 '-') |
| 317 |
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz |
| 318 |
- https://dev.gentoo.org/~ryao/dist/${PN}-kmod-${MY_PV}-p2.tar.xz" |
| 319 |
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
| 320 |
+ SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" |
| 321 |
+ S="${WORKDIR}/${PN}-${P}" |
| 322 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
| 323 |
fi |
| 324 |
|
| 325 |
@@ -61,21 +59,33 @@ RDEPEND="${COMMON_DEPEND} |
| 326 |
app-misc/pax-utils |
| 327 |
!<sys-boot/grub-2.00-r2:2 |
| 328 |
) |
| 329 |
+ !>=sys-fs/udev-init-scripts-28 |
| 330 |
" |
| 331 |
|
| 332 |
pkg_setup() { |
| 333 |
- : |
| 334 |
+ if use kernel_linux; then |
| 335 |
+ linux-info_pkg_setup |
| 336 |
+ if ! linux_config_exists; then |
| 337 |
+ ewarn "Cannot check the linux kernel configuration." |
| 338 |
+ else |
| 339 |
+ # recheck that we don't have usblp to collide with libusb |
| 340 |
+ if use test-suite; then |
| 341 |
+ if linux_chkconfig_present BLK_DEV_LOOP; then |
| 342 |
+ eerror "The ZFS test suite requires loop device support enabled." |
| 343 |
+ eerror "Please enable it:" |
| 344 |
+ eerror " CONFIG_BLK_DEV_LOOP=y" |
| 345 |
+ eerror "in /usr/src/linux/.config or" |
| 346 |
+ eerror " Device Drivers --->" |
| 347 |
+ eerror " Block devices --->" |
| 348 |
+ eerror " [ ] Loopback device support" |
| 349 |
+ fi |
| 350 |
+ fi |
| 351 |
+ fi |
| 352 |
+ fi |
| 353 |
+ |
| 354 |
} |
| 355 |
|
| 356 |
src_prepare() { |
| 357 |
- if [ ${PV} != "9999" ] |
| 358 |
- then |
| 359 |
- # Apply patch set |
| 360 |
- EPATCH_SUFFIX="patch" \ |
| 361 |
- EPATCH_FORCE="yes" \ |
| 362 |
- epatch "${WORKDIR}/${PN}-kmod-${MY_PV}-patches" |
| 363 |
- fi |
| 364 |
- |
| 365 |
# Update paths |
| 366 |
sed -e "s|/sbin/lsmod|/bin/lsmod|" \ |
| 367 |
-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \ |
| 368 |
@@ -132,8 +142,49 @@ pkg_postinst() { |
| 369 |
update_moduledb |
| 370 |
fi |
| 371 |
|
| 372 |
- [ -e "${EROOT}etc/runlevels/boot/zfs" ] \ |
| 373 |
- || ewarn 'You should add zfs to the boot runlevel.' |
| 374 |
+ if [ -e "${EROOT}etc/runlevels/boot/zfs" ] |
| 375 |
+ then |
| 376 |
+ einfo 'The zfs boot script has been split into the zfs-import,' |
| 377 |
+ einfo 'zfs-mount and zfs-share scripts.' |
| 378 |
+ einfo |
| 379 |
+ einfo 'You had the zfs script in your boot runlevel. For your' |
| 380 |
+ einfo 'convenience, it has been automatically removed and the three' |
| 381 |
+ einfo 'scripts that replace it have been configured to start.' |
| 382 |
+ einfo 'The zfs-import and zfs-mount scripts have been added to the boot' |
| 383 |
+ einfo 'runlevel while the zfs-share script is in the default runlevel.' |
| 384 |
+ |
| 385 |
+ rm "${EROOT}etc/runlevels/boot/zfs" |
| 386 |
+ ln -snf "${EROOT}etc/init.d/zfs-import" \ |
| 387 |
+ "${EROOT}etc/runlevels/boot/zfs-import" |
| 388 |
+ ln -snf "${EROOT}etc/init.d/zfs-mount" \ |
| 389 |
+ "${EROOT}etc/runlevels/boot/zfs-mount" |
| 390 |
+ ln -snf "${EROOT}etc/init.d/zfs-share" \ |
| 391 |
+ "${EROOT}etc/runlevels/default/zfs-share" |
| 392 |
+ else |
| 393 |
+ [ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \ |
| 394 |
+ einfo "You should add zfs-import to the boot runlevel." |
| 395 |
+ [ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \ |
| 396 |
+ einfo "You should add zfs-mount to the boot runlevel." |
| 397 |
+ [ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \ |
| 398 |
+ einfo "You should add zfs-share to the default runlevel." |
| 399 |
+ fi |
| 400 |
+ |
| 401 |
+ if [ -e "${EROOT}etc/runlevels/default/zed" ] |
| 402 |
+ then |
| 403 |
+ einfo 'The downstream OpenRC zed script has replaced by the upstream' |
| 404 |
+ einfo 'OpenRC zfs-zed script.' |
| 405 |
+ einfo |
| 406 |
+ einfo 'You had the zed script in your default runlevel. For your' |
| 407 |
+ einfo 'convenience, it has been automatically removed and the zfs-zed' |
| 408 |
+ einfo 'script that replaced it has been configured to start.' |
| 409 |
+ |
| 410 |
+ rm "${EROOT}etc/runlevels/boot/zed" |
| 411 |
+ ln -snf "${EROOT}etc/init.d/zfs-sed" \ |
| 412 |
+ "${EROOT}etc/runlevels/default/zfs-zed" |
| 413 |
+ else |
| 414 |
+ [ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \ |
| 415 |
+ einfo "You should add zfs-zed to the default runlevel." |
| 416 |
+ fi |
| 417 |
|
| 418 |
if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ] |
| 419 |
then |
| 420 |
|
| 421 |
diff --git a/sys-kernel/spl/Manifest b/sys-kernel/spl/Manifest |
| 422 |
index 5c2d17c..c0f2eae 100644 |
| 423 |
--- a/sys-kernel/spl/Manifest |
| 424 |
+++ b/sys-kernel/spl/Manifest |
| 425 |
@@ -11,4 +11,5 @@ DIST spl-0.6.3-patches-r1.tar.xz 15996 SHA256 7f1cf74c9be5c14eeff529ce0a45d7dcca |
| 426 |
DIST spl-0.6.3.tar.gz 221430 SHA256 5d60dfbe86a50e65dbce17f538d8d0874a0cc293374f59eed46cd2dd1809a944 SHA512 c4b82f1e279c7581d0082c044157e8a933edf53233c8c7c8202117454cfda0473ab85fbb56ac0b6da09a4d6798e33020a9c55bf23e25d630efa3265545c3defc WHIRLPOOL eaf001a96a80264e16ce416da38b988eabbfd2fce17690151a496a3141c32e92e5d00791e2d9c009ae0cf6910f80434c10f02a700752fc664f6bf6723bb03dba |
| 427 |
DIST spl-0.6.4.2.tar.gz 190421 SHA256 05c428f48acc55287c0662a90cfc087985b8ef3694dc057cfb16e1fa2ebbda43 SHA512 6a295651622dd1819bc9ef8f693c6a3cf73dbb084a4789ad508dda644bfcaa1984c5487ea0e16c8d6d468da59a3fae2e9309b2b13cd869a4af4ea675c394bbe3 WHIRLPOOL e270b66ac9e22c806876e727ef040c3cfb2c304889de982f1c54a1625f7bf0214d3b6f8baac42cb3710aa23897f1b1bc67ef633fe35cb1b2c4b57196390a0fad |
| 428 |
DIST spl-0.6.4.tar.gz 190348 SHA256 290c20cec89161a0e3e3a885494dfb7b0b7defbe38006cb2ecfdf2b241136415 SHA512 4dda082170884811a2667ecdc130e9e3743bf362109bebb53bd69a18115b8e2b41305d212a03f4233258f866fe7c56ed4a3f08fc1814fa1f8e947b5305a056ab WHIRLPOOL 475593c4b0f75fb30c963196bf6e45219b4a57bd8c9d4350f02ff358c97a69f066b5d4ce8cb346b67d773d7ff985e1812925a5490b8911b9cd657e654772bb9f |
| 429 |
+DIST spl-0.6.5.2.tar.gz 193153 SHA256 2642b69870b32e0feeaa57fbfcef546a330064bd4e5805c4862a97287a9287ca SHA512 9db23daf6cc1d6aaa926c987e284d7dbbc538876d6a8b9636d3126efc2be9d54b5ae2cb9cb3a89b604b3d4106374d85d9ad2c1acaf940a1299c1620ee1526d3f WHIRLPOOL cc99f131f9dfcc9ef84237f16491c8c5417af70c57dcbc3dba448c83f93636d5161b301f4fefa4fa8c54c56a1864cd9ce5d5fc758697803bac880839ea57e359 |
| 430 |
DIST spl-0.6.5.tar.gz 193043 SHA256 5e687254eca8f35fb52a387ea685c7bb0b1c17c29caff3a710761ba418011e3b SHA512 3d7362a4867a85b72dd93b9cb08fccf6fefed3322ace6090e7ab3ae847053b0e7da4f73a6634cde727638c6d945726306b2f4a964da3b1980ba34bdef531541a WHIRLPOOL 0deb87d6ba22532513a87a8f8aab78d4c61985ec028e251e003d56a270dc8cb6a0a96a278afe95368a27fb815474225285b90b5cdad1b1743390a8980b4ac373 |
| 431 |
|
| 432 |
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-0.6.5.2.ebuild |
| 433 |
similarity index 88% |
| 434 |
copy from sys-kernel/spl/spl-9999.ebuild |
| 435 |
copy to sys-kernel/spl/spl-0.6.5.2.ebuild |
| 436 |
index 03171e0..e9236e5 100644 |
| 437 |
--- a/sys-kernel/spl/spl-9999.ebuild |
| 438 |
+++ b/sys-kernel/spl/spl-0.6.5.2.ebuild |
| 439 |
@@ -12,9 +12,8 @@ if [[ ${PV} == "9999" ]] ; then |
| 440 |
EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
| 441 |
else |
| 442 |
inherit eutils versionator |
| 443 |
- MY_PV=$(replace_version_separator 3 '-') |
| 444 |
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz" |
| 445 |
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
| 446 |
+ SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" |
| 447 |
+ S="${WORKDIR}/${PN}-${P}" |
| 448 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
| 449 |
fi |
| 450 |
|
| 451 |
@@ -46,7 +45,6 @@ pkg_setup() { |
| 452 |
KALLSYMS |
| 453 |
!PAX_KERNEXEC_PLUGIN_METHOD_OR |
| 454 |
!PAX_SIZE_OVERFLOW |
| 455 |
- !PAX_RANDKSTACK |
| 456 |
ZLIB_DEFLATE |
| 457 |
ZLIB_INFLATE |
| 458 |
" |
| 459 |
@@ -57,10 +55,10 @@ pkg_setup() { |
| 460 |
!DEBUG_INFO_REDUCED |
| 461 |
" |
| 462 |
|
| 463 |
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
| 464 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
| 465 |
|
| 466 |
[ ${PV} != "9999" ] && \ |
| 467 |
- { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; } |
| 468 |
+ { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } |
| 469 |
|
| 470 |
check_extra_config |
| 471 |
} |
| 472 |
@@ -92,7 +90,6 @@ src_configure() { |
| 473 |
--with-linux="${KV_DIR}" |
| 474 |
--with-linux-obj="${KV_OUT_DIR}" |
| 475 |
$(use_enable debug) |
| 476 |
- $(use_enable debug-log) |
| 477 |
) |
| 478 |
autotools-utils_src_configure |
| 479 |
} |
| 480 |
|
| 481 |
diff --git a/sys-kernel/spl/spl-9999.ebuild b/sys-kernel/spl/spl-9999.ebuild |
| 482 |
index 03171e0..e9236e5 100644 |
| 483 |
--- a/sys-kernel/spl/spl-9999.ebuild |
| 484 |
+++ b/sys-kernel/spl/spl-9999.ebuild |
| 485 |
@@ -12,9 +12,8 @@ if [[ ${PV} == "9999" ]] ; then |
| 486 |
EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git" |
| 487 |
else |
| 488 |
inherit eutils versionator |
| 489 |
- MY_PV=$(replace_version_separator 3 '-') |
| 490 |
- SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz" |
| 491 |
- S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
| 492 |
+ SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${P}.tar.gz" |
| 493 |
+ S="${WORKDIR}/${PN}-${P}" |
| 494 |
KEYWORDS="~amd64 ~arm ~ppc ~ppc64" |
| 495 |
fi |
| 496 |
|
| 497 |
@@ -46,7 +45,6 @@ pkg_setup() { |
| 498 |
KALLSYMS |
| 499 |
!PAX_KERNEXEC_PLUGIN_METHOD_OR |
| 500 |
!PAX_SIZE_OVERFLOW |
| 501 |
- !PAX_RANDKSTACK |
| 502 |
ZLIB_DEFLATE |
| 503 |
ZLIB_INFLATE |
| 504 |
" |
| 505 |
@@ -57,10 +55,10 @@ pkg_setup() { |
| 506 |
!DEBUG_INFO_REDUCED |
| 507 |
" |
| 508 |
|
| 509 |
- kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
| 510 |
+ kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" |
| 511 |
|
| 512 |
[ ${PV} != "9999" ] && \ |
| 513 |
- { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; } |
| 514 |
+ { kernel_is le 4 3 || die "Linux 4.3 is the latest supported version."; } |
| 515 |
|
| 516 |
check_extra_config |
| 517 |
} |
| 518 |
@@ -92,7 +90,6 @@ src_configure() { |
| 519 |
--with-linux="${KV_DIR}" |
| 520 |
--with-linux-obj="${KV_OUT_DIR}" |
| 521 |
$(use_enable debug) |
| 522 |
- $(use_enable debug-log) |
| 523 |
) |
| 524 |
autotools-utils_src_configure |
| 525 |
} |
Archives