diff options
Diffstat (limited to 'sys-fs')
| -rw-r--r-- | sys-fs/zfs/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-fs/zfs/Manifest | 6 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-0.6.0_rc10.ebuild | 148 | ||||
| -rw-r--r-- | sys-fs/zfs/zfs-9999.ebuild | 17 |
4 files changed, 163 insertions, 17 deletions
diff --git a/sys-fs/zfs/ChangeLog b/sys-fs/zfs/ChangeLog index dd18fdc8a69a..52ff0b46453e 100644 --- a/sys-fs/zfs/ChangeLog +++ b/sys-fs/zfs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/zfs # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.43 2012/08/11 20:05:05 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/ChangeLog,v 1.44 2012/08/15 23:04:21 ryao Exp $ + +*zfs-0.6.0_rc10 (15 Aug 2012) + + 15 Aug 2012; Richard Yao <ryao@gentoo.org> +zfs-0.6.0_rc10.ebuild, + zfs-9999.ebuild: + Add 0.6.0-rc10 release 11 Aug 2012; Richard Yao <ryao@gentoo.org> zfs-0.6.0_rc9-r6.ebuild, zfs-9999.ebuild: @@ -192,4 +198,3 @@ 27 Jan 2012; Mike Gilbert <floppym@gentoo.org> +files/zfs.initd, +metadata.xml, +zfs-9999.ebuild: New package. - diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest index 7e3ed6f15ea4..5273b1fff9ae 100644 --- a/sys-fs/zfs/Manifest +++ b/sys-fs/zfs/Manifest @@ -9,8 +9,10 @@ AUX zfs-0.6.0_rc9-remove-pfmalloc-1-of-3.patch 1438 SHA256 d1f1b3f47e0ada27e43ac AUX zfs-0.6.0_rc9-remove-pfmalloc-2-of-3.patch 1979 SHA256 6f61761703c4c71d8c91fb6e49b927069301698d78fea35c2bcdc603bfdce59d SHA512 dd4bfdd218791c6eef6120d95049860ba304ac474872357f3a5ff5b3783421a39035c732cd508f990145ff371bb8fcca2757152d41d963bcd559fa8f69fdedbe WHIRLPOOL 9bbd6479c22c905615ba6b4188aa332a9ec2685536cd6f784da28c081fdde430df15cb902b2ec1f7f9cdbfdcb20aabbc49460f5de09656686193001338c05a7a AUX zfs-0.6.0_rc9-remove-pfmalloc-3-of-3.patch 2593 SHA256 a51425a9d97dc7177be6bf05a14d1905d52be5b503ab27e570e1e7e254befcf8 SHA512 7579231f68a1d840a1d568b12bb5bc8bd78d15c379020618b061015cc4771655650157e993ee77731f9bdc6e7ee1a6dd3ead3f548724e72e398b0400a9eeb5e4 WHIRLPOOL 57787a873e5c0195060a3e146c34f465df3c8fcb8123263435fcc9180bebef19fbba911767f8e5131063c0e1199db34c40c062038bb1d9bed311a4d8ac2e85ce AUX zfs-shutdown 1252 SHA256 cba63ddf086044c7e041c296ea86f68a1579ac830b8bea56b9f74b4204f96553 SHA512 1c04ba8c1f533efdc2ea938ba508d1789fc6bb653e5ad84dfcd78e41f1271f05309df670b9b8246c3317c96060028266230c83b8c21b7abf71442320cd33a219 WHIRLPOOL 58a3e23d316f673bee78e9837c6aea3be6bfceab5e89a0717b0290257a7a682bef67e6ae98e6f92a0c41a1da043a6ba6eded5974bbff3ee50c39e48ea8d3c77f +DIST zfs-0.6.0-rc10.tar.gz 2061969 SHA256 250978869fe4b0f3a5c4f7aa2ae2f584b311e9036064a4f2135b33fe3ce567d6 SHA512 e6634453b378c6cd8d8799ce0a1f7016f3607b80bd3c87cd80f36ee9330ca065a1678d489f49675481f7e7d630e5511ea30e421515444e60549f753c051ca52d WHIRLPOOL 24997422fe14226623f3d2f34fe92c22f6b8b0975d488d67198e53b744aa4e775a82e56b69be83ab593820320707348d611127f1a8719a100cc9fea108a85761 DIST zfs-0.6.0-rc9.tar.gz 1989469 SHA256 a014475fab410caf209e99b448aeffe0070d1d9fc002fb33dd56f73dba87b1fd SHA512 4586119ce2a66eac0645d7b6a604236ebd6691e743874c2f4f6c1642188bd19f4abace3bc8edb4f2fdded65ffd1ad4e0f555f05556661fc2523337281e32089c WHIRLPOOL c28982933cecd68eefb43b179fe38214149dc81cf87b14fe1f009bfc676e0642645522d366f61076d486528ffa94de1252fe08d3cb0967ff7f79fc7f0c0ad862 +EBUILD zfs-0.6.0_rc10.ebuild 3457 SHA256 6b57b5563e4fae25eca6166a022fc5c623af77e911ec0355c679176fc47ab678 SHA512 99881d55f6d2de69b107026561c1f8a78c9925bdc72687e3a3e85ad231c1e004deec495b5ce4f9672e18032aa04e76b70292f29b7437d7953af174eabc741400 WHIRLPOOL 9919fee2bbda21da7dce2c592773423d2281cd0b3be2bf08086daa3b5fed5991d082a5fb9a147e262f105d08570ef69d6e18fbfdb94ade1bc9cab93d6242e0cd EBUILD zfs-0.6.0_rc9-r6.ebuild 3731 SHA256 d178d44f8adf9bfc06c857e2ba75292637652b2c39d2738c55c6317f24d6493c SHA512 5acf339f2070ba0c7bfd77f823aa0530d0d0a8be52a99da2e7359921cfc71da3836070faaffcacafc19fb4d6e4d9537b4b7e47e44e65ca076d999efa4cd11904 WHIRLPOOL 325e0cf038692808ae226636efb3d1203723f80f1e9d0a8ec09cfb246c5b50078d466d16f2409acd8eac52160d93c44d12289f34b02ba19efea72819d99a9ec7 -EBUILD zfs-9999.ebuild 3724 SHA256 51a7b2949113f75d4196fd7df2a00b1e736d72d37dcdaf4d9a6af27303979ab2 SHA512 3b1725c4fea30a6844b8733ba6f239e10704aba8fc355011bc011f799fbf288117298c07a1eba767130116f6279093d8f0ccb5ea10cfaee62dcdd3aacc0f09e2 WHIRLPOOL 078c5c6a4e1664ef4a6e0392bd9f19801b26265836049655a90f064b805d1718ea68f1727253488f5a2005fd895e3ee8ccc9d2c3e9d91912c7030e31f3021190 -MISC ChangeLog 7616 SHA256 effb8e6ed69aa3098ed0f4af2aa978e32168858ddcdb4b519516ea1f7a79e130 SHA512 442376d76d710107b6230812393242bf5a6f4bb10d3514844ca4aee8ae1e4538f74ec52dbe7c63188e38076809a7270a1b338058225b58db7d2181736338ef08 WHIRLPOOL 5a230054bf7ef5af270057dbe4a6d8f80a5a25e75bccf587bb56494a7889b2e5a8a45bfe4286dad61276be5efb6dd72700c238f72d56942d6c03a88b9d96df3b +EBUILD zfs-9999.ebuild 3452 SHA256 c2ce4163b520ea843124032aee9d10d6b1d1fba679a4e367c08c7d4944fef44e SHA512 6e3337f6522ded3fcc136fd674d6ffd9c26ccfa871d3faf2e3be0f1639e2c0616163e071935a4b172b5532c99e160e3d2042aae9783bfa2f2412aca1d6d42ad4 WHIRLPOOL 4b888c02079598684583e3e18059952c14b2917a42dbbcce9f25b7bce540c1ebe738a00e7b7d1d9a82b9d9fb4450ec9e3e226c2ead0f5e180e09d2891a2c0016 +MISC ChangeLog 7760 SHA256 791ab83e9c2abd709b7e7090d2643ddb5f80eced3560de9deae67620b8b5731d SHA512 de06c65079477bca75da5d58b828615193fd13b8b890462dd224fd09b24891f78c5e82fb92cbf11af8776776d16845e814289894dd3bd762af83449f7d5d3881 WHIRLPOOL 8ed1edf0e7c39ba5a41538fcdc7e5d3aadc51033aee1478708682023bbe3541c4a914e7d062d3743bcc373917bfa2d45e47ba5e3f9001107b8c25a623af4f6c9 MISC metadata.xml 460 SHA256 4f32c18bfc4d75883f198b1166ad4f5d7a95deb11eca99d476f305ed31875e7d SHA512 80e3d510553f1ab052ecea017e51d6ec2878e75b180ba8b72593ce775e423e5eb71806516b655d9714b8dadb4921888bc8874bb1ee19757efd63dc9f40a703c0 WHIRLPOOL e4dabc36cf1cb920f010493c0ba1854e884b3180ec286c51ac5ec1ce4edd32705657d3b0e9e45419a89156c7f08927acb1ab94b938955981aa1fb8d1a391d4ac diff --git a/sys-fs/zfs/zfs-0.6.0_rc10.ebuild b/sys-fs/zfs/zfs-0.6.0_rc10.ebuild new file mode 100644 index 000000000000..87359bbcfa08 --- /dev/null +++ b/sys-fs/zfs/zfs-0.6.0_rc10.ebuild @@ -0,0 +1,148 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-0.6.0_rc10.ebuild,v 1.1 2012/08/15 23:04:21 ryao Exp $ + +EAPI="4" + +AT_M4DIR="config" +AUTOTOOLS_AUTORECONF="1" +AUTOTOOLS_IN_SOURCE_BUILD="1" + +inherit bash-completion-r1 flag-o-matic linux-mod toolchain-funcs autotools-utils + +if [ ${PV} == "9999" ] ; then + inherit git-2 + EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" +else + inherit eutils versionator + MY_PV=$(replace_version_separator 3 '-') + SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" + S="${WORKDIR}/${PN}-${MY_PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Native ZFS for Linux" +HOMEPAGE="http://zfsonlinux.org/" + +LICENSE="BSD-2 CDDL MIT" +SLOT="0" +IUSE="custom-cflags debug dracut +rootfs test test-suite static-libs" + +COMMON_DEPEND=" + =sys-kernel/spl-${PV}* + sys-apps/util-linux[static-libs?] + sys-libs/zlib[static-libs(+)?] +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" + +RDEPEND="${COMMON_DEPEND} + !sys-fs/zfs-fuse + !prefix? ( sys-fs/udev ) + test-suite? ( + sys-apps/gawk + 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 + ) +" +DEPEND+=" + test? ( sys-fs/mdadm ) +" + +pkg_setup() { + CONFIG_CHECK="!DEBUG_LOCK_ALLOC + !PREEMPT + BLK_DEV_LOOP + EFI_PARTITION + MODULES + !PAX_KERNEXEC_PLUGIN_METHOD_OR + ZLIB_DEFLATE + ZLIB_INFLATE" + use rootfs && \ + CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD + DEVTMPFS" + kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" + check_extra_config +} + +src_prepare() { + # Workaround for hard coded path + sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/common.sh.in || die + # Workaround rename + sed -i "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" scripts/common.sh.in || die + + if [ ${PV} != "9999" ] + then + # Fix various deadlocks + epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-1-of-3.patch" + epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-2-of-3.patch" + epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-3-of-3.patch" + fi + + autotools-utils_src_prepare +} + +src_configure() { + use custom-cflags || strip-flags + set_arch_to_kernel + local myeconfargs=( + --bindir="${EPREFIX}/bin" + --sbindir="${EPREFIX}/sbin" + --with-config=all + --with-linux="${KV_DIR}" + --with-linux-obj="${KV_OUT_DIR}" + --with-udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" + $(use_enable debug) + ) + autotools-utils_src_configure +} + +src_test() { + if [ $UID -ne 0 ] + then + ewarn "Cannot run make check tests with FEATURES=userpriv." + ewarn "Skipping make check tests." + else + autotools-utils_src_test + fi +} + +src_install() { + autotools-utils_src_install + gen_usr_ldscript -a uutil nvpair zpool zfs + use dracut || rm -rf "${ED}usr/share/dracut" + use test-suite || rm -rf "${ED}usr/libexec" + + if use rootfs + then + doinitd "${FILESDIR}/zfs-shutdown" + exeinto /usr/share/zfs + doexe "${FILESDIR}/linuxrc" + fi + + newbashcomp "${FILESDIR}/bash-completion" zfs + +} + +pkg_postinst() { + linux-mod_pkg_postinst + + use x86 && ewarn "32-bit kernels are unsupported by ZFSOnLinux upstream. Do not file bug reports." + + [ -e "${EROOT}/etc/runlevels/boot/zfs" ] \ + || ewarn 'You should add zfs to the boot runlevel.' + + use rootfs && ([ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ] \ + || ewarn 'You should add zfs-shutdown to the shutdown runlevel.') + +} diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index dd9608c538d9..22f957af5b07 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.33 2012/08/11 20:05:05 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs/zfs-9999.ebuild,v 1.34 2012/08/15 23:04:21 ryao Exp $ EAPI="4" @@ -83,19 +83,10 @@ src_prepare() { if [ ${PV} != "9999" ] then - # Fix build issues - epatch "${FILESDIR}/${P}-hardened-support.patch" - epatch "${FILESDIR}/${P}-hardened-3.3-and-later-support.patch" - epatch "${FILESDIR}/${P}-linux-3.5-support.patch" - epatch "${FILESDIR}/${P}-fix-32-bit-warnings.patch" - # Fix various deadlocks - epatch "${FILESDIR}/${P}-remove-pfmalloc-1-of-3.patch" - epatch "${FILESDIR}/${P}-remove-pfmalloc-2-of-3.patch" - epatch "${FILESDIR}/${P}-remove-pfmalloc-3-of-3.patch" - - #Miscellaneous - epatch "${FILESDIR}/${P}-bsd-init.patch" + epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-1-of-3.patch" + epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-2-of-3.patch" + epatch "${FILESDIR}/${PN}-0.6.0_rc9-remove-pfmalloc-3-of-3.patch" fi autotools-utils_src_prepare |