| 1 |
ryao 12/06/17 17:03:13 |
| 2 |
|
| 3 |
Modified: spl-0.6.0_rc9.ebuild spl-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Add patch to take advantage of kernel change from bug #416685 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.49/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.3 sys-kernel/spl/spl-0.6.0_rc9.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild?rev=1.3&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild?rev=1.3&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild?r1=1.2&r2=1.3 |
| 15 |
|
| 16 |
Index: spl-0.6.0_rc9.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild,v |
| 19 |
retrieving revision 1.2 |
| 20 |
retrieving revision 1.3 |
| 21 |
diff -u -r1.2 -r1.3 |
| 22 |
--- spl-0.6.0_rc9.ebuild 17 Jun 2012 16:40:27 -0000 1.2 |
| 23 |
+++ spl-0.6.0_rc9.ebuild 17 Jun 2012 17:03:12 -0000 1.3 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2012 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild,v 1.2 2012/06/17 16:40:27 ryao Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.0_rc9.ebuild,v 1.3 2012/06/17 17:03:12 ryao Exp $ |
| 29 |
|
| 30 |
EAPI="4" |
| 31 |
AUTOTOOLS_AUTORECONF="1" |
| 32 |
@@ -11,7 +11,7 @@ |
| 33 |
inherit git-2 |
| 34 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
| 35 |
else |
| 36 |
- inherit versionator |
| 37 |
+ inherit eutils versionator |
| 38 |
MY_PV=$(replace_version_separator 3 '-') |
| 39 |
SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" |
| 40 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 41 |
@@ -48,6 +48,12 @@ |
| 42 |
src_prepare() { |
| 43 |
# Workaround for hard coded path |
| 44 |
sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die |
| 45 |
+ |
| 46 |
+ if [ ${PV} != "9999" ] |
| 47 |
+ then |
| 48 |
+ epatch "${FILESDIR}/${P}-detect-kernel-honors-gfp-flags.patch" |
| 49 |
+ fi |
| 50 |
+ |
| 51 |
autotools-utils_src_prepare |
| 52 |
} |
| 53 |
|
| 54 |
|
| 55 |
|
| 56 |
|
| 57 |
1.17 sys-kernel/spl/spl-9999.ebuild |
| 58 |
|
| 59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-9999.ebuild?rev=1.17&view=markup |
| 60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-9999.ebuild?rev=1.17&content-type=text/plain |
| 61 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-9999.ebuild?r1=1.16&r2=1.17 |
| 62 |
|
| 63 |
Index: spl-9999.ebuild |
| 64 |
=================================================================== |
| 65 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v |
| 66 |
retrieving revision 1.16 |
| 67 |
retrieving revision 1.17 |
| 68 |
diff -u -r1.16 -r1.17 |
| 69 |
--- spl-9999.ebuild 17 Jun 2012 16:40:27 -0000 1.16 |
| 70 |
+++ spl-9999.ebuild 17 Jun 2012 17:03:12 -0000 1.17 |
| 71 |
@@ -1,6 +1,6 @@ |
| 72 |
# Copyright 1999-2012 Gentoo Foundation |
| 73 |
# Distributed under the terms of the GNU General Public License v2 |
| 74 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.16 2012/06/17 16:40:27 ryao Exp $ |
| 75 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-9999.ebuild,v 1.17 2012/06/17 17:03:12 ryao Exp $ |
| 76 |
|
| 77 |
EAPI="4" |
| 78 |
AUTOTOOLS_AUTORECONF="1" |
| 79 |
@@ -11,7 +11,7 @@ |
| 80 |
inherit git-2 |
| 81 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
| 82 |
else |
| 83 |
- inherit versionator |
| 84 |
+ inherit eutils versionator |
| 85 |
MY_PV=$(replace_version_separator 3 '-') |
| 86 |
SRC_URI="https://github.com/downloads/zfsonlinux/${PN}/${PN}-${MY_PV}.tar.gz" |
| 87 |
S="${WORKDIR}/${PN}-${MY_PV}" |
| 88 |
@@ -48,6 +48,12 @@ |
| 89 |
src_prepare() { |
| 90 |
# Workaround for hard coded path |
| 91 |
sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die |
| 92 |
+ |
| 93 |
+ if [ ${PV} != "9999" ] |
| 94 |
+ then |
| 95 |
+ epatch "${FILESDIR}/${P}-detect-kernel-honors-gfp-flags.patch" |
| 96 |
+ fi |
| 97 |
+ |
| 98 |
autotools-utils_src_prepare |
| 99 |
} |
| 100 |
|
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.18 sys-kernel/spl/ChangeLog |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?rev=1.18&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?rev=1.18&content-type=text/plain |
| 108 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?r1=1.17&r2=1.18 |
| 109 |
|
| 110 |
Index: ChangeLog |
| 111 |
=================================================================== |
| 112 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v |
| 113 |
retrieving revision 1.17 |
| 114 |
retrieving revision 1.18 |
| 115 |
diff -u -r1.17 -r1.18 |
| 116 |
--- ChangeLog 17 Jun 2012 16:40:27 -0000 1.17 |
| 117 |
+++ ChangeLog 17 Jun 2012 17:03:12 -0000 1.18 |
| 118 |
@@ -1,6 +1,11 @@ |
| 119 |
# ChangeLog for sys-kernel/spl |
| 120 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 121 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.17 2012/06/17 16:40:27 ryao Exp $ |
| 122 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.18 2012/06/17 17:03:12 ryao Exp $ |
| 123 |
+ |
| 124 |
+ 17 Jun 2012; Richard Yao <ryao@g.o> |
| 125 |
+ +files/spl-0.6.0_rc9-detect-kernel-honors-gfp-flags.patch, |
| 126 |
+ spl-0.6.0_rc9.ebuild, spl-9999.ebuild: |
| 127 |
+ Add patch to take advantage of kernel change from bug #416685 |
| 128 |
|
| 129 |
17 Jun 2012; Richard Yao <ryao@g.o> spl-0.6.0_rc9.ebuild, |
| 130 |
spl-9999.ebuild: |
Archives