ryao 14/09/05 18:23:36
Modified: zfs-kmod-0.6.3.ebuild zfs-kmod-9999.ebuild
ChangeLog
Log:
Add preliminary ebuild changes for Gentoo Prefix support; Provide message to
die if updating META fails; Sync 0.6.3 and 9999 ebuilds.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
0xBEE84C64)
Revision Changes Path
1.3 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.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild?r1=1.2&r2=1.3
Index: zfs-kmod-0.6.3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zfs-kmod-0.6.3.ebuild 7 Aug 2014 18:23:45 -0000 1.2
+++ zfs-kmod-0.6.3.ebuild 5 Sep 2014 18:23:36 -0000 1.3
@@ -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-0.6.3.ebuild,v 1.2
2014/08/07 18:23:45 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-0.6.3.ebuild,v 1.3
2014/09/05 18:23:36 ryao Exp $
EAPI="4"
@@ -8,12 +8,12 @@
AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs
autotools-utils
+inherit 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"
+ EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git";
else
inherit eutils versionator
MY_PV=$(replace_version_separator 3 '-')
@@ -55,6 +55,7 @@
use debug && CONFIG_CHECK="${CONFIG_CHECK}
FRAME_POINTER
DEBUG_INFO
+ !DEBUG_INFO_REDUCED
"
use rootfs && \
@@ -76,7 +77,8 @@
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
+ [ ${PV} != "9999" ] && \
+ { sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META"
|| die "Could not set Gentoo release"; }
autotools-utils_src_prepare
}
@@ -86,7 +88,7 @@
filter-ldflags -Wl,*
set_arch_to_kernel
- local myeconfargs=(
+ local myeconfargs=(${myeconfargs}
--bindir="${EPREFIX}/bin"
--sbindir="${EPREFIX}/sbin"
--with-config=kernel
@@ -94,11 +96,16 @@
--with-linux-obj="${KV_OUT_DIR}"
$(use_enable debug)
)
+
+ SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \
+ myeconfargs="${myeconfargs}
--with-spl=${EROOT}usr/src/${SPL_PATH} \
+
--with-spl-obj=${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+
autotools-utils_src_configure
}
src_install() {
- autotools-utils_src_install
+ autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT}
dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
}
1.25 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.25&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?rev=1.25&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild?r1=1.24&r2=1.25
Index: zfs-kmod-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- zfs-kmod-9999.ebuild 9 Jul 2014 01:29:39 -0000 1.24
+++ zfs-kmod-9999.ebuild 5 Sep 2014 18:23:36 -0000 1.25
@@ -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.24
2014/07/09 01:29:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild,v 1.25
2014/09/05 18:23:36 ryao Exp $
EAPI="4"
@@ -8,7 +8,7 @@
AUTOTOOLS_AUTORECONF="1"
AUTOTOOLS_IN_SOURCE_BUILD="1"
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod toolchain-funcs
autotools-utils
+inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
if [ ${PV} == "9999" ] ; then
inherit git-2
@@ -67,7 +67,7 @@
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."; }
+ { kernel_is le 3 16 || die "Linux 3.16 is the latest supported
version."; }
check_extra_config
}
@@ -76,6 +76,10 @@
# 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
}
@@ -84,7 +88,7 @@
filter-ldflags -Wl,*
set_arch_to_kernel
- local myeconfargs=(
+ local myeconfargs=(${myeconfargs}
--bindir="${EPREFIX}/bin"
--sbindir="${EPREFIX}/sbin"
--with-config=kernel
@@ -92,11 +96,16 @@
--with-linux-obj="${KV_OUT_DIR}"
$(use_enable debug)
)
+
+ SPL_PATH=$(basename $(echo "${EROOT}usr/src/spl-"*)) \
+ myeconfargs="${myeconfargs}
--with-spl=${EROOT}usr/src/${SPL_PATH} \
+
--with-spl-obj=${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
+
autotools-utils_src_configure
}
src_install() {
- autotools-utils_src_install
+ autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT}
dodoc AUTHORS COPYRIGHT DISCLAIMER README.markdown
}
1.52 sys-fs/zfs-kmod/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.52&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?rev=1.52&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/zfs-kmod/ChangeLog?r1=1.51&r2=1.52
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- ChangeLog 7 Aug 2014 18:23:45 -0000 1.51
+++ ChangeLog 5 Sep 2014 18:23:36 -0000 1.52
@@ -1,6 +1,11 @@
# 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.51 2014/08/07
18:23:45 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/zfs-kmod/ChangeLog,v 1.52 2014/09/05
18:23:36 ryao Exp $
+
+ 05 Sep 2014; Richard Yao <[email protected]> zfs-kmod-0.6.3.ebuild,
+ zfs-kmod-9999.ebuild:
+ Add preliminary ebuild changes for Gentoo Prefix support; Provide message to
+ die if updating META fails; Sync 0.6.3 and 9999 ebuilds.
07 Aug 2014; Richard Yao <[email protected]> zfs-kmod-0.6.3.ebuild:
No code changes are needed to support Linux 3.16. I modifying the ebuild to
