Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-kernel/genkernel: genkernel-9999-r1.ebuild genkernel-3.4.50.ebuild genkernel-9999.ebuild ChangeLog
Date: Mon, 23 Jun 2014 23:57:07
Message-Id: 20140623235651.681FD2004E@flycatcher.gentoo.org
1 robbat2 14/06/23 23:56:51
2
3 Modified: genkernel-9999.ebuild ChangeLog
4 Added: genkernel-9999-r1.ebuild genkernel-3.4.50.ebuild
5 Log:
6 Move distfiles to $GK_SHARE/distfiles instead of /var/cache; make naming of files from --{minkern,modules}package match kernel naming from --install, and also fix the paths used with them. 9999-r1 contains EAPI4/5 proposed cleanups.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.52 sys-kernel/genkernel/genkernel-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.52&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.52&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?r1=1.51&r2=1.52
16
17 Index: genkernel-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v
20 retrieving revision 1.51
21 retrieving revision 1.52
22 diff -p -w -b -B -u -u -r1.51 -r1.52
23 --- genkernel-9999.ebuild 21 Jun 2014 15:32:58 -0000 1.51
24 +++ genkernel-9999.ebuild 23 Jun 2014 23:56:51 -0000 1.52
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.51 2014/06/21 15:32:58 ryao Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.52 2014/06/23 23:56:51 robbat2 Exp $
30
31 # genkernel-9999 -> latest Git branch "master"
32 # genkernel-VERSION -> normal genkernel release
33 @@ -123,18 +123,17 @@ src_install() {
34 cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
35
36 # Copy files to /var/cache/genkernel/src
37 - elog "Copying files to /var/cache/genkernel/src..."
38 - mkdir -p "${D}"/var/cache/genkernel/src
39 - cp -f \
40 - "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
41 - "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
42 - "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
43 - "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
44 - "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
45 - "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
46 - "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
47 - "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
48 - "${D}"/var/cache/genkernel/src || die "Copying distfiles..."
49 + GKDISTDIR=/usr/share/genkernel/distfiles/
50 + elog "Copying files to ${GKDISTDIR}..."
51 + insinto $GKDISTDIR
52 + doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
53 + doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
54 + doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
55 + doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
56 + doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
57 + doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
58 + doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
59 + doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
60
61 newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
62 insinto /etc
63
64
65
66 1.390 sys-kernel/genkernel/ChangeLog
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.390&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.390&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?r1=1.389&r2=1.390
71
72 Index: ChangeLog
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v
75 retrieving revision 1.389
76 retrieving revision 1.390
77 diff -p -w -b -B -u -u -r1.389 -r1.390
78 --- ChangeLog 21 Jun 2014 15:32:58 -0000 1.389
79 +++ ChangeLog 23 Jun 2014 23:56:51 -0000 1.390
80 @@ -1,6 +1,15 @@
81 # ChangeLog for sys-kernel/genkernel
82 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
83 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.389 2014/06/21 15:32:58 ryao Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.390 2014/06/23 23:56:51 robbat2 Exp $
85 +
86 +*genkernel-9999-r1 (23 Jun 2014)
87 +*genkernel-3.4.50 (23 Jun 2014)
88 +
89 + 23 Jun 2014; Robin H. Johnson <robbat2@g.o> +genkernel-3.4.50.ebuild,
90 + +genkernel-9999-r1.ebuild, genkernel-9999.ebuild:
91 + Move distfiles to $GK_SHARE/distfiles instead of /var/cache; make naming of
92 + files from --{minkern,modules}package match kernel naming from --install, and
93 + also fix the paths used with them. 9999-r1 contains EAPI4/5 proposed cleanups.
94
95 21 Jun 2014; Richard Yao <ryao@g.o> genkernel-3.4.45.1.ebuild,
96 genkernel-3.4.48.ebuild, genkernel-3.4.49.1.ebuild, genkernel-3.4.49.2.ebuild,
97
98
99
100 1.1 sys-kernel/genkernel/genkernel-9999-r1.ebuild
101
102 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild?rev=1.1&view=markup
103 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild?rev=1.1&content-type=text/plain
104
105 Index: genkernel-9999-r1.ebuild
106 ===================================================================
107 # Copyright 1999-2014 Gentoo Foundation
108 # Distributed under the terms of the GNU General Public License v2
109 # $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild,v 1.1 2014/06/23 23:56:51 robbat2 Exp $
110
111 # genkernel-9999 -> latest Git branch "master"
112 # genkernel-VERSION -> normal genkernel release
113
114 EAPI=4 # works with EAPI5 without changes, but this is more supported for a crucial package
115
116 VERSION_BUSYBOX='1.20.2'
117 VERSION_DMRAID='1.0.0.rc16-3'
118 VERSION_MDADM='3.1.5'
119 VERSION_FUSE='2.8.6'
120 VERSION_ISCSI='2.0-872'
121 VERSION_LVM='2.02.88'
122 VERSION_UNIONFS_FUSE='0.24'
123 VERSION_GPG='1.4.11'
124
125 RH_HOME="ftp://sources.redhat.com/pub"
126 DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
127 BB_HOME="http://www.busybox.net/downloads"
128
129 COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
130 ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
131 mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
132 ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
133 ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
134 ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
135 http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
136 mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
137 http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
138 mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
139
140 if [[ ${PV} == 9999* ]]
141 then
142 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
143 http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
144 inherit git-2 bash-completion-r1 eutils
145 S="${WORKDIR}/${PN}"
146 SRC_URI="${COMMON_URI}"
147 KEYWORDS=""
148 else
149 inherit bash-completion-r1 eutils
150 SRC_URI="mirror://gentoo/${P}.tar.bz2
151 ${COMMON_URI}"
152 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
153 fi
154
155 DESCRIPTION="Gentoo automatic kernel building scripts"
156 HOMEPAGE="http://www.gentoo.org"
157
158 LICENSE="GPL-2"
159 SLOT="0"
160 RESTRICT=""
161 IUSE="cryptsetup ibm selinux"
162
163 DEPEND="sys-fs/e2fsprogs
164 selinux? ( sys-libs/libselinux )"
165 RDEPEND="${DEPEND}
166 cryptsetup? ( sys-fs/cryptsetup )
167 app-arch/cpio
168 >=app-misc/pax-utils-0.2.1
169 !<sys-apps/openrc-0.9.9"
170 # pax-utils is used for lddtree
171
172 if [[ ${PV} == 9999* ]]; then
173 DEPEND="${DEPEND} app-text/asciidoc"
174 fi
175
176 pkg_pretend() {
177 if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
178 ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
179 ewarn "Please set flag 'cryptsetup' for this very package if you would like"
180 ewarn "to have genkernel create an initramfs with LUKS support."
181 ewarn "Sorry for the inconvenience."
182 echo
183 fi
184 }
185
186 src_unpack() {
187 if [[ ${PV} == 9999* ]] ; then
188 git-2_src_unpack
189 else
190 unpack ${P}.tar.bz2
191 fi
192 }
193
194 src_prepare() {
195 if [[ ${PV} == 9999* ]] ; then
196 einfo "Producing ChangeLog from Git history..."
197 pushd "${S}/.git" >/dev/null || die
198 git log > "${S}"/ChangeLog || die
199 popd >/dev/null || die
200 fi
201 if use selinux ; then
202 sed -i 's/###//g' "${S}"/gen_compile.sh || die
203 fi
204
205 # Update software.sh
206 sed -i \
207 -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
208 -e "s:VERSION_MDADM:$VERSION_MDADM:" \
209 -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
210 -e "s:VERSION_FUSE:$VERSION_FUSE:" \
211 -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
212 -e "s:VERSION_LVM:$VERSION_LVM:" \
213 -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
214 -e "s:VERSION_GPG:$VERSION_GPG:" \
215 "${S}"/defaults/software.sh \
216 || die "Could not adjust versions"
217
218 epatch_user
219 }
220
221 src_compile() {
222 if [[ ${PV} == 9999* ]] ; then
223 emake
224 fi
225 }
226
227 src_install() {
228 insinto /etc
229 doins "${S}"/genkernel.conf
230
231 doman genkernel.8
232 dodoc AUTHORS ChangeLog README TODO
233 dobin genkernel
234 rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf || die
235
236 if use ibm ; then
237 cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
238 else
239 cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
240 fi
241 insinto /usr/share/genkernel
242 doins -r "${S}"/*
243
244 newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
245 insinto /etc
246 doins "${FILESDIR}"/initramfs.mounts
247
248 cd "${DISTDIR}"
249 insinto /usr/share/genkernel/distfiles
250 doins ${A/${P}.tar.bz2/}
251 }
252
253 pkg_postinst() {
254 echo
255 elog 'Documentation is available in the genkernel manual page'
256 elog 'as well as the following URL:'
257 echo
258 elog 'http://www.gentoo.org/doc/en/genkernel.xml'
259 echo
260 ewarn "This package is known to not work with reiser4. If you are running"
261 ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
262 ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
263 ewarn "broken in this regard. Try using a sane filesystem like ext4."
264 echo
265 ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
266 ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
267 echo
268 }
269
270
271
272 1.1 sys-kernel/genkernel/genkernel-3.4.50.ebuild
273
274 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild?rev=1.1&view=markup
275 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild?rev=1.1&content-type=text/plain
276
277 Index: genkernel-3.4.50.ebuild
278 ===================================================================
279 # Copyright 1999-2014 Gentoo Foundation
280 # Distributed under the terms of the GNU General Public License v2
281 # $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild,v 1.1 2014/06/23 23:56:51 robbat2 Exp $
282
283 # genkernel-9999 -> latest Git branch "master"
284 # genkernel-VERSION -> normal genkernel release
285
286 EAPI="3"
287
288 VERSION_BUSYBOX='1.20.2'
289 VERSION_DMRAID='1.0.0.rc16-3'
290 VERSION_MDADM='3.1.5'
291 VERSION_FUSE='2.8.6'
292 VERSION_ISCSI='2.0-872'
293 VERSION_LVM='2.02.88'
294 VERSION_UNIONFS_FUSE='0.24'
295 VERSION_GPG='1.4.11'
296
297 RH_HOME="ftp://sources.redhat.com/pub"
298 DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
299 BB_HOME="http://www.busybox.net/downloads"
300
301 COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
302 ${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
303 mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
304 ${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
305 ${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
306 ${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
307 http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
308 mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
309 http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
310 mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
311
312 if [[ ${PV} == 9999* ]]
313 then
314 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
315 http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
316 inherit git-2 bash-completion-r1 eutils
317 S="${WORKDIR}/${PN}"
318 SRC_URI="${COMMON_URI}"
319 KEYWORDS=""
320 else
321 inherit bash-completion-r1 eutils
322 SRC_URI="mirror://gentoo/${P}.tar.bz2
323 ${COMMON_URI}"
324 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
325 fi
326
327 DESCRIPTION="Gentoo automatic kernel building scripts"
328 HOMEPAGE="http://www.gentoo.org"
329
330 LICENSE="GPL-2"
331 SLOT="0"
332 RESTRICT=""
333 IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt' below working!
334
335 DEPEND="sys-fs/e2fsprogs
336 selinux? ( sys-libs/libselinux )"
337 RDEPEND="${DEPEND}
338 cryptsetup? ( sys-fs/cryptsetup )
339 app-arch/cpio
340 >=app-misc/pax-utils-0.2.1
341 !<sys-apps/openrc-0.9.9"
342 # pax-utils is used for lddtree
343
344 if [[ ${PV} == 9999* ]]; then
345 DEPEND="${DEPEND} app-text/asciidoc"
346 fi
347
348 src_unpack() {
349 if [[ ${PV} == 9999* ]] ; then
350 git-2_src_unpack
351 else
352 unpack ${P}.tar.bz2
353 fi
354 }
355
356 src_prepare() {
357 if [[ ${PV} == 9999* ]] ; then
358 einfo "Producing ChangeLog from Git history..."
359 pushd "${S}/.git" >/dev/null || die
360 git log > "${S}"/ChangeLog || die
361 popd >/dev/null || die
362 fi
363 use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
364
365 # Update software.sh
366 sed -i \
367 -e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
368 -e "s:VERSION_MDADM:$VERSION_MDADM:" \
369 -e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
370 -e "s:VERSION_FUSE:$VERSION_FUSE:" \
371 -e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
372 -e "s:VERSION_LVM:$VERSION_LVM:" \
373 -e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
374 -e "s:VERSION_GPG:$VERSION_GPG:" \
375 "${S}"/defaults/software.sh \
376 || die "Could not adjust versions"
377
378 epatch_user
379 }
380
381 src_compile() {
382 if [[ ${PV} == 9999* ]]; then
383 emake || die
384 fi
385 }
386
387 src_install() {
388 insinto /etc
389 doins "${S}"/genkernel.conf || die "doins genkernel.conf"
390
391 doman genkernel.8 || die "doman"
392 dodoc AUTHORS ChangeLog README TODO || die "dodoc"
393
394 dobin genkernel || die "dobin genkernel"
395
396 rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
397
398 insinto /usr/share/genkernel
399 doins -r "${S}"/* || die "doins"
400 use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
401 cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
402
403 # Copy files to /var/cache/genkernel/src
404 GKDISTDIR=/usr/share/genkernel/distfiles/
405 elog "Copying files to ${GKDISTDIR}..."
406 insinto $GKDISTDIR
407 doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
408 doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
409 doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
410 doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
411 doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
412 doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
413 doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
414 doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
415
416 newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
417 insinto /etc
418 doins "${FILESDIR}"/initramfs.mounts
419 }
420
421 pkg_postinst() {
422 echo
423 elog 'Documentation is available in the genkernel manual page'
424 elog 'as well as the following URL:'
425 echo
426 elog 'http://www.gentoo.org/doc/en/genkernel.xml'
427 echo
428 ewarn "This package is known to not work with reiser4. If you are running"
429 ewarn "reiser4 and have a problem, do not file a bug. We know it does not"
430 ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
431 ewarn "broken in this regard. Try using a sane filesystem like ext3 or"
432 ewarn "even reiser3."
433 echo
434 ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
435 ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
436 echo
437 if use crypt && ! use cryptsetup ; then
438 ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup' (bug #414523)."
439 ewarn "Please set flag 'cryptsetup' for this very package if you would like"
440 ewarn "to have genkernel create an initramfs with LUKS support."
441 ewarn "Sorry for the inconvenience."
442 echo
443 fi
444 }