1 |
ryao 13/05/28 13:07:09 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: spl-0.6.1-r2.ebuild |
5 |
Log: |
6 |
Fix delay() |
7 |
|
8 |
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.56 sys-kernel/spl/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?rev=1.56&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?rev=1.56&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/ChangeLog?r1=1.55&r2=1.56 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v |
20 |
retrieving revision 1.55 |
21 |
retrieving revision 1.56 |
22 |
diff -u -r1.55 -r1.56 |
23 |
--- ChangeLog 25 Apr 2013 20:30:50 -0000 1.55 |
24 |
+++ ChangeLog 28 May 2013 13:07:09 -0000 1.56 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for sys-kernel/spl |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.55 2013/04/25 20:30:50 ryao Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/ChangeLog,v 1.56 2013/05/28 13:07:09 ryao Exp $ |
30 |
+ |
31 |
+*spl-0.6.1-r2 (28 May 2013) |
32 |
+ |
33 |
+ 28 May 2013; Richard Yao <ryao@g.o> +files/spl-0.6.1-fix-delay.patch, |
34 |
+ +spl-0.6.1-r2.ebuild, spl-0.6.1.ebuild: |
35 |
+ Fix delay() |
36 |
|
37 |
*spl-0.6.1-r1 (25 Apr 2013) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 sys-kernel/spl/spl-0.6.1-r2.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.1-r2.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/spl/spl-0.6.1-r2.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: spl-0.6.1-r2.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2013 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/spl/spl-0.6.1-r2.ebuild,v 1.1 2013/05/28 13:07:09 ryao Exp $ |
52 |
|
53 |
EAPI="4" |
54 |
AUTOTOOLS_AUTORECONF="1" |
55 |
|
56 |
inherit flag-o-matic linux-info linux-mod autotools-utils |
57 |
|
58 |
if [[ ${PV} == "9999" ]] ; then |
59 |
inherit git-2 |
60 |
EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git" |
61 |
else |
62 |
inherit eutils versionator |
63 |
MY_PV=$(replace_version_separator 3 '-') |
64 |
SRC_URI="https://github.com/zfsonlinux/${PN}/archive/${PN}-${MY_PV}.tar.gz" |
65 |
S="${WORKDIR}/${PN}-${PN}-${MY_PV}" |
66 |
KEYWORDS="~amd64" |
67 |
fi |
68 |
|
69 |
DESCRIPTION="The Solaris Porting Layer is a Linux kernel module which provides many of the Solaris kernel APIs" |
70 |
HOMEPAGE="http://zfsonlinux.org/" |
71 |
|
72 |
LICENSE="GPL-2" |
73 |
SLOT="0" |
74 |
IUSE="custom-cflags debug debug-log" |
75 |
RESTRICT="test" |
76 |
|
77 |
COMMON_DEPEND="dev-lang/perl |
78 |
virtual/awk" |
79 |
|
80 |
DEPEND="${COMMON_DEPEND}" |
81 |
|
82 |
RDEPEND="${COMMON_DEPEND} |
83 |
!sys-devel/spl" |
84 |
|
85 |
AT_M4DIR="config" |
86 |
AUTOTOOLS_IN_SOURCE_BUILD="1" |
87 |
|
88 |
pkg_setup() { |
89 |
linux-info_pkg_setup |
90 |
CONFIG_CHECK=" |
91 |
!DEBUG_LOCK_ALLOC |
92 |
!GRKERNSEC_HIDESYM |
93 |
MODULES |
94 |
KALLSYMS |
95 |
!PAX_KERNEXEC_PLUGIN_METHOD_OR |
96 |
ZLIB_DEFLATE |
97 |
ZLIB_INFLATE |
98 |
" |
99 |
|
100 |
kernel_is ge 2 6 26 || die "Linux 2.6.26 or newer required" |
101 |
|
102 |
[ ${PV} != "9999" ] && \ |
103 |
{ kernel_is le 3 9 || die "Linux 3.9 is the latest supported version."; } |
104 |
|
105 |
check_extra_config |
106 |
} |
107 |
|
108 |
src_prepare() { |
109 |
# Workaround for hard coded path |
110 |
sed -i "s|/sbin/lsmod|/bin/lsmod|" scripts/check.sh || die |
111 |
|
112 |
if [ ${PV} != "9999" ] |
113 |
then |
114 |
# Be more like FreeBSD and Illumos when handling hostids |
115 |
epatch "${FILESDIR}/${PN}-0.6.0_rc14-simplify-hostid-logic.patch" |
116 |
|
117 |
# Block tasks properly |
118 |
epatch "${FILESDIR}/${PN}-0.6.1-fix-delay.patch" |
119 |
|
120 |
spl-0.6.1-fix-delay.patch |
121 |
|
122 |
if kernel_is ge 3 8 |
123 |
then |
124 |
epatch "${FILESDIR}/${PN}-0.6.1-constify-ctl_table.patch" |
125 |
fi |
126 |
fi |
127 |
|
128 |
# splat is unnecessary unless we are debugging |
129 |
use debug || sed -e 's/^subdir-m += splat$//' -i "${S}/module/Makefile.in" |
130 |
|
131 |
autotools-utils_src_prepare |
132 |
} |
133 |
|
134 |
src_configure() { |
135 |
use custom-cflags || strip-flags |
136 |
filter-ldflags -Wl,* |
137 |
|
138 |
set_arch_to_kernel |
139 |
local myeconfargs=( |
140 |
--bindir="${EPREFIX}/bin" |
141 |
--sbindir="${EPREFIX}/sbin" |
142 |
--with-config=all |
143 |
--with-linux="${KV_DIR}" |
144 |
--with-linux-obj="${KV_OUT_DIR}" |
145 |
$(use_enable debug) |
146 |
$(use_enable debug-log) |
147 |
) |
148 |
autotools-utils_src_configure |
149 |
} |
150 |
|
151 |
src_install() { |
152 |
autotools-utils_src_install |
153 |
dodoc AUTHORS DISCLAIMER README.markdown |
154 |
} |
155 |
|
156 |
pkg_postinst() { |
157 |
linux-mod_pkg_postinst |
158 |
|
159 |
# Remove old modules |
160 |
if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/spl" ] |
161 |
then |
162 |
ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/spl" |
163 |
ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/spl" |
164 |
ewarn "Automatically removing old modules to avoid problems." |
165 |
rm -r "${EROOT}lib/modules/${KV_FULL}/addon/spl" || die "Cannot remove modules" |
166 |
rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon" |
167 |
fi |
168 |
} |