ryao 14/09/05 18:30:46 Modified: spl-9999.ebuild spl-0.6.3.ebuild ChangeLog Log: Add preliminary ebuild changes for Gentoo Prefix support; Make die always print a message; Fix CONFIG_CHECK when USE=debug is set; 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.42 sys-kernel/spl/spl-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-9999.ebuild?rev=1.42&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-9999.ebuild?rev=1.42&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-9999.ebuild?r1=1.41&r2=1.42 Index: spl-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- spl-9999.ebuild 9 Jul 2014 01:27:27 -0000 1.41 +++ spl-9999.ebuild 5 Sep 2014 18:30:46 -0000 1.42 @@ -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-kernel/spl/spl-9999.ebuild,v 1.41 2014/07/09 01:27:27 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.42 2014/09/05 18:30:46 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -48,31 +48,33 @@ ZLIB_DEFLATE ZLIB_INFLATE " - use debug && CONFIG_CHECK="FRAME_POINTER - DEBUG_INFO - !DEBUG_INFO_REDUCED" + + use debug && CONFIG_CHECK="${CONFIG_CHECK} + FRAME_POINTER + DEBUG_INFO + !DEBUG_INFO_REDUCED + " kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" [ ${PV} != "9999" ] && \ - { kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; } + { kernel_is le 3 16 || die "Linux 3.16 is the latest supported version."; } check_extra_config } src_prepare() { # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die - - if [ ${PV} != "9999" ] - then - # Be more like FreeBSD and Illumos when handling hostids - epatch "${FILESDIR}/${PN}-0.6.0_rc14-simplify-hostid-logic.patch" - fi + sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ + die "Cannot patch check.sh" # splat is unnecessary unless we are debugging use debug || sed -e 's/^subdir-m += splat$//' -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 } @@ -94,7 +96,7 @@ } src_install() { - autotools-utils_src_install + autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT} dodoc AUTHORS DISCLAIMER README.markdown } 1.3 sys-kernel/spl/spl-0.6.3.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.3.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.3.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.3.ebuild?r1=1.2&r2=1.3 Index: spl-0.6.3.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.3.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- spl-0.6.3.ebuild 7 Aug 2014 18:23:04 -0000 1.2 +++ spl-0.6.3.ebuild 5 Sep 2014 18:30:46 -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-kernel/spl/spl-0.6.3.ebuild,v 1.2 2014/08/07 18:23:04 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.3.ebuild,v 1.3 2014/09/05 18:30:46 ryao Exp $ EAPI="4" AUTOTOOLS_AUTORECONF="1" @@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-2 - EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" + EGIT_REPO_URI="https://github.com/zfsonlinux/${PN}.git"; else inherit eutils versionator MY_PV=$(replace_version_separator 3 '-') @@ -48,8 +48,12 @@ ZLIB_DEFLATE ZLIB_INFLATE " - use debug && CONFIG_CHECK="FRAME_POINTER - DEBUG_INFO" + + use debug && CONFIG_CHECK="${CONFIG_CHECK} + FRAME_POINTER + DEBUG_INFO + !DEBUG_INFO_REDUCED + " kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" @@ -61,13 +65,15 @@ src_prepare() { # Workaround for hard coded path - sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || die + sed -i "s|/sbin/lsmod|/bin/lsmod|" "${S}/scripts/check.sh" || \ + die "Cannot patch check.sh" # splat is unnecessary unless we are debugging use debug || sed -e 's/^subdir-m += splat$//' -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 } @@ -90,7 +96,7 @@ } src_install() { - autotools-utils_src_install + autotools-utils_src_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH:-$EROOT} dodoc AUTHORS DISCLAIMER README.markdown } 1.77 sys-kernel/spl/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?rev=1.77&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?rev=1.77&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?r1=1.76&r2=1.77 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- ChangeLog 7 Aug 2014 18:23:04 -0000 1.76 +++ ChangeLog 5 Sep 2014 18:30:46 -0000 1.77 @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/spl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.76 2014/08/07 18:23:04 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.77 2014/09/05 18:30:46 ryao Exp $ + + 05 Sep 2014; Richard Yao <r...@gentoo.org> spl-0.6.3.ebuild, spl-9999.ebuild: + Add preliminary ebuild changes for Gentoo Prefix support; Make die always + print a message; Fix CONFIG_CHECK when USE=debug is set; Sync 0.6.3 and 9999 + ebuilds 07 Aug 2014; Richard Yao <r...@gentoo.org> spl-0.6.3.ebuild: No code changes are needed to support Linux 3.16. I modifying the ebuild to
