ryao 14/06/13 01:21:17 Modified: zfs-kmod-9999.ebuild ChangeLog Added: zfs-kmod-0.6.3.ebuild Log: Bump to 0.6.3 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)
Revision Changes Path 1.22 sys-fs/zfs-kmod/zfs-kmod-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.22&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.22&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?r1=1.21&r2=1.22 Index: zfs-kmod-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- zfs-kmod-9999.ebuild 22 May 2014 21:39:35 -0000 1.21 +++ zfs-kmod-9999.ebuild 13 Jun 2014 01:21:17 -0000 1.22 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.21 2014/05/22 21:39:35 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.22 2014/06/13 01:21:17 ryao Exp $ EAPI="4" @@ -17,8 +17,7 @@ else inherit eutils versionator MY_PV=$(replace_version_separator 3 '-') - SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz - http://dev.gentoo.org/~ryao/dist/${PN}-${MY_PV}-p2.tar.xz"; + SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"; S="${WORKDIR}/zfs-zfs-${MY_PV}" KEYWORDS="~amd64" fi @@ -53,17 +52,21 @@ ZLIB_INFLATE " - use debug && CONFIG_CHECK="FRAME_POINTER - DEBUG_INFO" + use debug && CONFIG_CHECK="${CONFIG_CHECK} + FRAME_POINTER + DEBUG_INFO + " use rootfs && \ - CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD - DEVTMPFS" + CONFIG_CHECK="${CONFIG_CHECK} + BLK_DEV_INITRD + DEVTMPFS + " kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" [ ${PV} != "9999" ] && \ - { kernel_is le 3 12 || die "Linux 3.12 is the latest supported version."; } + { kernel_is le 3 15 || die "Linux 3.15 is the latest supported version."; } check_extra_config } @@ -72,14 +75,6 @@ # Remove GPLv2-licensed ZPIOS unless we are debugging use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in" - if [ ${PV} != "9999" ] - then - # Apply patch set - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/${PN}-${MY_PV}-patches" - fi - autotools-utils_src_prepare } 1.48 sys-fs/zfs-kmod/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.48&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.48&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?r1=1.47&r2=1.48 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- ChangeLog 8 Jun 2014 17:13:57 -0000 1.47 +++ ChangeLog 13 Jun 2014 01:21:17 -0000 1.48 @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/zfs-kmod # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.47 2014/06/08 17:13:57 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.48 2014/06/13 01:21:17 ryao Exp $ + +*zfs-kmod-0.6.3 (13 Jun 2014) + + 13 Jun 2014; Richard Yao <r...@gentoo.org> +zfs-kmod-0.6.3.ebuild, + zfs-kmod-9999.ebuild: + Bump to 0.6.3 08 Jun 2014; Richard Yao <r...@gentoo.org> -files/zfs-kmod-0.6.0_rc11-fix-32-bit-integer-size-mismatch.patch, 1.1 sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?rev=1.1&content-type=text/plain Index: zfs-kmod-0.6.3.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v 1.1 2014/06/13 01:21:17 ryao Exp $ EAPI="4" AT_M4DIR="config" AUTOTOOLS_AUTORECONF="1" AUTOTOOLS_IN_SOURCE_BUILD="1" inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils if [ ${PV} == "9999" ] ; then inherit git-2 MY_PV=9999 EGIT_REPO_URI="git://github.com/zfsonlinux/zfs.git" else inherit eutils versionator MY_PV=$(replace_version_separator 3 '-') SRC_URI="https://github.com/zfsonlinux/zfs/archive/zfs-${MY_PV}.tar.gz"; S="${WORKDIR}/zfs-zfs-${MY_PV}" KEYWORDS="~amd64" fi 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 " pkg_setup() { linux-info_pkg_setup CONFIG_CHECK="!DEBUG_LOCK_ALLOC BLK_DEV_LOOP EFI_PARTITION IOSCHED_NOOP MODULES !PAX_KERNEXEC_PLUGIN_METHOD_OR ZLIB_DEFLATE ZLIB_INFLATE " use debug && CONFIG_CHECK="${CONFIG_CHECK} FRAME_POINTER DEBUG_INFO " use rootfs && \ CONFIG_CHECK="${CONFIG_CHECK} BLK_DEV_INITRD DEVTMPFS " kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" [ ${PV} != "9999" ] && \ { kernel_is le 3 15 || die "Linux 3.15 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 sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die autotools-utils_src_prepare } src_configure() { use custom-cflags || strip-flags filter-ldflags -Wl,* set_arch_to_kernel local myeconfargs=( --bindir="${EPREFIX}/bin" --sbindir="${EPREFIX}/sbin" --with-config=kernel --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" $(use_enable debug) ) autotools-utils_src_configure } src_install() { autotools-utils_src_install dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown } 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 features flags." ewarn "If you upgrade your pools to make use of feature flags, you will lose" ewarn "the ability to import them using older versions of ZFSOnLinux." ewarn "Any new pools will be created with feature flag support and will" ewarn "not be compatible with older versions of ZFSOnLinux. To create a new" ewarn "pool that is backward compatible, use zpool create -o version=28 ..." }
