1 |
tomwij 13/11/22 16:31:08 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ck-sources-3.11.9.ebuild ck-sources-3.12.1.ebuild |
5 |
Log: |
6 |
Version bump to 3.11.9 and 3.12.1, proxied commit for Eric F. GARIOUD; fixes bug #491874. |
7 |
|
8 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.226 sys-kernel/ck-sources/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ChangeLog?rev=1.226&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ChangeLog?rev=1.226&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ChangeLog?r1=1.225&r2=1.226 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v |
20 |
retrieving revision 1.225 |
21 |
retrieving revision 1.226 |
22 |
diff -u -r1.225 -r1.226 |
23 |
--- ChangeLog 18 Nov 2013 18:11:50 -0000 1.225 |
24 |
+++ ChangeLog 22 Nov 2013 16:31:08 -0000 1.226 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for sys-kernel/ck-sources |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.225 2013/11/18 18:11:50 tomwij Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.226 2013/11/22 16:31:08 tomwij Exp $ |
30 |
+ |
31 |
+*ck-sources-3.12.1 (22 Nov 2013) |
32 |
+*ck-sources-3.11.9 (22 Nov 2013) |
33 |
+ |
34 |
+ 22 Nov 2013; Tom Wijsman <TomWij@g.o> +ck-sources-3.11.9.ebuild, |
35 |
+ +ck-sources-3.12.1.ebuild: |
36 |
+ Version bump to 3.11.9 and 3.12.1, proxied commit for Eric F. GARIOUD; fixes |
37 |
+ bug #491874. |
38 |
|
39 |
*ck-sources-3.10.17 (18 Nov 2013) |
40 |
*ck-sources-3.9.11-r1 (18 Nov 2013) |
41 |
|
42 |
|
43 |
|
44 |
1.1 sys-kernel/ck-sources/ck-sources-3.11.9.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.11.9.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.11.9.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: ck-sources-3.11.9.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.11.9.ebuild,v 1.1 2013/11/22 16:31:08 tomwij Exp $ |
54 |
|
55 |
EAPI="5" |
56 |
ETYPE="sources" |
57 |
KEYWORDS="~amd64 ~x86" |
58 |
IUSE="bfsonly" |
59 |
|
60 |
HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ |
61 |
http://users.on.net/~ckolivas/kernel/" |
62 |
|
63 |
K_WANT_GENPATCHES="base extras experimental" |
64 |
K_EXP_GENPATCHES_PULL="1" |
65 |
K_EXP_GENPATCHES_NOUSE="1" |
66 |
K_GENPATCHES_VER="13" |
67 |
K_SECURITY_UNSUPPORTED="1" |
68 |
K_DEBLOB_AVAILABLE="1" |
69 |
|
70 |
inherit kernel-2 |
71 |
detect_version |
72 |
detect_arch |
73 |
|
74 |
K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" |
75 |
|
76 |
DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches" |
77 |
|
78 |
#-- If Gentoo-Sources don't follow then extra incremental patches are needed - |
79 |
|
80 |
XTRA_INCP_MIN="" |
81 |
XTRA_INCP_MAX="" |
82 |
|
83 |
#-- |
84 |
|
85 |
CK_VERSION="1" |
86 |
BFS_VERSION="441" |
87 |
|
88 |
CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2" |
89 |
BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch" |
90 |
|
91 |
CK_BASE_URL="http://ck.kolivas.org/patches/3.0" |
92 |
CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" |
93 |
CK_URI="${CK_LVER_URL}/${CK_FILE}" |
94 |
BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}" |
95 |
|
96 |
#-- Build extra incremental patches list -------------------------------------- |
97 |
|
98 |
LX_INCP_URI="" |
99 |
LX_INCP_LIST="" |
100 |
if [ -n "${XTRA_INCP_MIN}" ]; then |
101 |
LX_INCP_URL="${KERNEL_BASE_URI}/incr" |
102 |
for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do |
103 |
LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2" |
104 |
LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}" |
105 |
LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}" |
106 |
done |
107 |
fi |
108 |
|
109 |
#-- CK needs sometimes to patch itself... (3.7)-------------------------------- |
110 |
|
111 |
CK_INCP_URI="" |
112 |
CK_INCP_LIST="" |
113 |
|
114 |
#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) ------- |
115 |
|
116 |
PRE_CK_FIX="" |
117 |
POST_CK_FIX="" |
118 |
|
119 |
#-- |
120 |
|
121 |
SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} |
122 |
!bfsonly? ( ${CK_URI} ) |
123 |
bfsonly? ( ${BFS_URI} )" |
124 |
|
125 |
UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}" |
126 |
|
127 |
if ! use bfsonly ; then |
128 |
UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}" |
129 |
else |
130 |
UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}" |
131 |
fi |
132 |
|
133 |
UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}" |
134 |
|
135 |
UNIPATCH_STRICTORDER="yes" |
136 |
|
137 |
#-- Since experimental genpatches && we want BFQ irrespective of experimental - |
138 |
|
139 |
K_EXP_GENPATCHES_LIST="50*_*.patch*" |
140 |
|
141 |
src_prepare() { |
142 |
|
143 |
#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- |
144 |
|
145 |
sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" |
146 |
} |
147 |
|
148 |
pkg_postinst() { |
149 |
|
150 |
kernel-2_pkg_postinst |
151 |
|
152 |
elog |
153 |
elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html" |
154 |
elog |
155 |
} |
156 |
|
157 |
|
158 |
|
159 |
1.1 sys-kernel/ck-sources/ck-sources-3.12.1.ebuild |
160 |
|
161 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.12.1.ebuild?rev=1.1&view=markup |
162 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.12.1.ebuild?rev=1.1&content-type=text/plain |
163 |
|
164 |
Index: ck-sources-3.12.1.ebuild |
165 |
=================================================================== |
166 |
# Copyright 1999-2013 Gentoo Foundation |
167 |
# Distributed under the terms of the GNU General Public License v2 |
168 |
# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-3.12.1.ebuild,v 1.1 2013/11/22 16:31:08 tomwij Exp $ |
169 |
|
170 |
EAPI="5" |
171 |
ETYPE="sources" |
172 |
KEYWORDS="~amd64 ~x86" |
173 |
IUSE="bfsonly" |
174 |
|
175 |
HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ |
176 |
http://users.on.net/~ckolivas/kernel/" |
177 |
|
178 |
K_WANT_GENPATCHES="base extras experimental" |
179 |
K_EXP_GENPATCHES_PULL="1" |
180 |
K_EXP_GENPATCHES_NOUSE="1" |
181 |
K_GENPATCHES_VER="2" |
182 |
K_SECURITY_UNSUPPORTED="1" |
183 |
K_DEBLOB_AVAILABLE="1" |
184 |
|
185 |
inherit kernel-2 |
186 |
detect_version |
187 |
detect_arch |
188 |
|
189 |
K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}" |
190 |
|
191 |
DESCRIPTION="Full Linux ${K_BRANCH_ID} kernel sources with Con Kolivas' high performance patchset and Gentoo's genpatches" |
192 |
|
193 |
#-- If Gentoo-Sources don't follow then extra incremental patches are needed - |
194 |
|
195 |
XTRA_INCP_MIN="" |
196 |
XTRA_INCP_MAX="" |
197 |
|
198 |
#-- |
199 |
|
200 |
CK_VERSION="1" |
201 |
BFS_VERSION="443" |
202 |
|
203 |
CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.bz2" |
204 |
BFS_FILE="${K_BRANCH_ID}-sched-bfs-${BFS_VERSION}.patch" |
205 |
|
206 |
CK_BASE_URL="http://ck.kolivas.org/patches/3.0" |
207 |
CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}" |
208 |
CK_URI="${CK_LVER_URL}/${CK_FILE}" |
209 |
BFS_URI="${CK_LVER_URL}/patches/${BFS_FILE}" |
210 |
|
211 |
#-- Build extra incremental patches list -------------------------------------- |
212 |
|
213 |
LX_INCP_URI="" |
214 |
LX_INCP_LIST="" |
215 |
if [ -n "${XTRA_INCP_MIN}" ]; then |
216 |
LX_INCP_URL="${KERNEL_BASE_URI}/incr" |
217 |
for i in `seq ${XTRA_INCP_MIN} ${XTRA_INCP_MAX}`; do |
218 |
LX_INCP[i]="patch-${K_BRANCH_ID}.${i}-$(($i+1)).bz2" |
219 |
LX_INCP_URI="${LX_INCP_URI} ${LX_INCP_URL}/${LX_INCP[i]}" |
220 |
LX_INCP_LIST="${LX_INCP_LIST} ${DISTDIR}/${LX_INCP[i]}" |
221 |
done |
222 |
fi |
223 |
|
224 |
#-- CK needs sometimes to patch itself... (3.7)-------------------------------- |
225 |
|
226 |
CK_INCP_URI="" |
227 |
CK_INCP_LIST="" |
228 |
|
229 |
#-- Local patches needed for the ck-patches to apply smoothly (3.4/3.5) ------- |
230 |
|
231 |
PRE_CK_FIX="" |
232 |
POST_CK_FIX="" |
233 |
|
234 |
#-- |
235 |
|
236 |
SRC_URI="${KERNEL_URI} ${LX_INCP_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_INCP_URI} |
237 |
!bfsonly? ( ${CK_URI} ) |
238 |
bfsonly? ( ${BFS_URI} )" |
239 |
|
240 |
UNIPATCH_LIST="${LX_INCP_LIST} ${PRE_CK_FIX} ${DISTDIR}" |
241 |
|
242 |
if ! use bfsonly ; then |
243 |
UNIPATCH_LIST="${UNIPATCH_LIST}/${CK_FILE}" |
244 |
else |
245 |
UNIPATCH_LIST="${UNIPATCH_LIST}/${BFS_FILE}" |
246 |
fi |
247 |
|
248 |
UNIPATCH_LIST="${UNIPATCH_LIST} ${CK_INCP_LIST} ${POST_CK_FIX}" |
249 |
|
250 |
UNIPATCH_STRICTORDER="yes" |
251 |
|
252 |
#-- Since experimental genpatches && we want BFQ irrespective of experimental - |
253 |
|
254 |
K_EXP_GENPATCHES_LIST="50*_*.patch*" |
255 |
|
256 |
src_prepare() { |
257 |
|
258 |
#-- Comment out CK's EXTRAVERSION in Makefile --------------------------------- |
259 |
|
260 |
sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" |
261 |
} |
262 |
|
263 |
pkg_postinst() { |
264 |
|
265 |
kernel-2_pkg_postinst |
266 |
|
267 |
elog |
268 |
elog "For more info on this patchset, see: http://forums.gentoo.org/viewtopic-t-941030-start-0.html" |
269 |
elog |
270 |
} |