robbat2 14/06/23 23:56:51
Modified: genkernel-9999.ebuild ChangeLog
Added: genkernel-9999-r1.ebuild genkernel-3.4.50.ebuild
Log:
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.
(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.52 sys-kernel/genkernel/genkernel-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.52&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?rev=1.52&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild?r1=1.51&r2=1.52
Index: genkernel-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v
retrieving revision 1.51
retrieving revision 1.52
diff -p -w -b -B -u -u -r1.51 -r1.52
--- genkernel-9999.ebuild 21 Jun 2014 15:32:58 -0000 1.51
+++ genkernel-9999.ebuild 23 Jun 2014 23:56:51 -0000 1.52
@@ -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/genkernel/genkernel-9999.ebuild,v 1.51
2014/06/21 15:32:58 ryao Exp $
+# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.52
2014/06/23 23:56:51 robbat2 Exp $
# genkernel-9999 -> latest Git branch "master"
# genkernel-VERSION -> normal genkernel release
@@ -123,18 +123,17 @@ src_install() {
cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
# Copy files to /var/cache/genkernel/src
- elog "Copying files to /var/cache/genkernel/src..."
- mkdir -p "${D}"/var/cache/genkernel/src
- cp -f \
- "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
- "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
- "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
- "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
- "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
- "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
- "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
- "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
- "${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+ GKDISTDIR=/usr/share/genkernel/distfiles/
+ elog "Copying files to ${GKDISTDIR}..."
+ insinto $GKDISTDIR
+ doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
+ doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
+ doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
+ doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
+ doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
+ doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+ doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
+ doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
insinto /etc
1.390 sys-kernel/genkernel/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.390&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?rev=1.390&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/ChangeLog?r1=1.389&r2=1.390
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v
retrieving revision 1.389
retrieving revision 1.390
diff -p -w -b -B -u -u -r1.389 -r1.390
--- ChangeLog 21 Jun 2014 15:32:58 -0000 1.389
+++ ChangeLog 23 Jun 2014 23:56:51 -0000 1.390
@@ -1,6 +1,15 @@
# ChangeLog for sys-kernel/genkernel
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.389
2014/06/21 15:32:58 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.390
2014/06/23 23:56:51 robbat2 Exp $
+
+*genkernel-9999-r1 (23 Jun 2014)
+*genkernel-3.4.50 (23 Jun 2014)
+
+ 23 Jun 2014; Robin H. Johnson <[email protected]> +genkernel-3.4.50.ebuild,
+ +genkernel-9999-r1.ebuild, genkernel-9999.ebuild:
+ 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.
21 Jun 2014; Richard Yao <[email protected]> genkernel-3.4.45.1.ebuild,
genkernel-3.4.48.ebuild, genkernel-3.4.49.1.ebuild,
genkernel-3.4.49.2.ebuild,
1.1 sys-kernel/genkernel/genkernel-9999-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild?rev=1.1&content-type=text/plain
Index: genkernel-9999-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999-r1.ebuild,v 1.1
2014/06/23 23:56:51 robbat2 Exp $
# genkernel-9999 -> latest Git branch "master"
# genkernel-VERSION -> normal genkernel release
EAPI=4 # works with EAPI5 without changes, but this is more supported for a
crucial package
VERSION_BUSYBOX='1.20.2'
VERSION_DMRAID='1.0.0.rc16-3'
VERSION_MDADM='3.1.5'
VERSION_FUSE='2.8.6'
VERSION_ISCSI='2.0-872'
VERSION_LVM='2.02.88'
VERSION_UNIONFS_FUSE='0.24'
VERSION_GPG='1.4.11'
RH_HOME="ftp://sources.redhat.com/pub";
DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src";
BB_HOME="http://www.busybox.net/downloads";
COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
if [[ ${PV} == 9999* ]]
then
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
http://git.overlays.gentoo.org/gitroot/proj/${PN}.git";
inherit git-2 bash-completion-r1 eutils
S="${WORKDIR}/${PN}"
SRC_URI="${COMMON_URI}"
KEYWORDS=""
else
inherit bash-completion-r1 eutils
SRC_URI="mirror://gentoo/${P}.tar.bz2
${COMMON_URI}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
HOMEPAGE="http://www.gentoo.org";
LICENSE="GPL-2"
SLOT="0"
RESTRICT=""
IUSE="cryptsetup ibm selinux"
DEPEND="sys-fs/e2fsprogs
selinux? ( sys-libs/libselinux )"
RDEPEND="${DEPEND}
cryptsetup? ( sys-fs/cryptsetup )
app-arch/cpio
>=app-misc/pax-utils-0.2.1
!<sys-apps/openrc-0.9.9"
# pax-utils is used for lddtree
if [[ ${PV} == 9999* ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
fi
pkg_pretend() {
if ! use cryptsetup && has_version "sys-kernel/genkernel[crypt]"; then
ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup'
(bug #414523)."
ewarn "Please set flag 'cryptsetup' for this very package if
you would like"
ewarn "to have genkernel create an initramfs with LUKS support."
ewarn "Sorry for the inconvenience."
echo
fi
}
src_unpack() {
if [[ ${PV} == 9999* ]] ; then
git-2_src_unpack
else
unpack ${P}.tar.bz2
fi
}
src_prepare() {
if [[ ${PV} == 9999* ]] ; then
einfo "Producing ChangeLog from Git history..."
pushd "${S}/.git" >/dev/null || die
git log > "${S}"/ChangeLog || die
popd >/dev/null || die
fi
if use selinux ; then
sed -i 's/###//g' "${S}"/gen_compile.sh || die
fi
# Update software.sh
sed -i \
-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-e "s:VERSION_LVM:$VERSION_LVM:" \
-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-e "s:VERSION_GPG:$VERSION_GPG:" \
"${S}"/defaults/software.sh \
|| die "Could not adjust versions"
epatch_user
}
src_compile() {
if [[ ${PV} == 9999* ]] ; then
emake
fi
}
src_install() {
insinto /etc
doins "${S}"/genkernel.conf
doman genkernel.8
dodoc AUTHORS ChangeLog README TODO
dobin genkernel
rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO
genkernel.conf || die
if use ibm ; then
cp "${S}"/arch/ppc64/kernel-2.6{-pSeries,} || die
else
cp "${S}"/arch/ppc64/kernel-2.6{.g5,} || die
fi
insinto /usr/share/genkernel
doins -r "${S}"/*
newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
insinto /etc
doins "${FILESDIR}"/initramfs.mounts
cd "${DISTDIR}"
insinto /usr/share/genkernel/distfiles
doins ${A/${P}.tar.bz2/}
}
pkg_postinst() {
echo
elog 'Documentation is available in the genkernel manual page'
elog 'as well as the following URL:'
echo
elog 'http://www.gentoo.org/doc/en/genkernel.xml'
echo
ewarn "This package is known to not work with reiser4. If you are
running"
ewarn "reiser4 and have a problem, do not file a bug. We know it does
not"
ewarn "work and we don't plan on fixing it since reiser4 is the one
that is"
ewarn "broken in this regard. Try using a sane filesystem like ext4."
echo
ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
ewarn "you use crypt_root=/dev/blah instead of
real_root=luks:/dev/blah."
echo
}
1.1 sys-kernel/genkernel/genkernel-3.4.50.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild?rev=1.1&content-type=text/plain
Index: genkernel-3.4.50.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header:
/var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.50.ebuild,v 1.1
2014/06/23 23:56:51 robbat2 Exp $
# genkernel-9999 -> latest Git branch "master"
# genkernel-VERSION -> normal genkernel release
EAPI="3"
VERSION_BUSYBOX='1.20.2'
VERSION_DMRAID='1.0.0.rc16-3'
VERSION_MDADM='3.1.5'
VERSION_FUSE='2.8.6'
VERSION_ISCSI='2.0-872'
VERSION_LVM='2.02.88'
VERSION_UNIONFS_FUSE='0.24'
VERSION_GPG='1.4.11'
RH_HOME="ftp://sources.redhat.com/pub";
DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src";
BB_HOME="http://www.busybox.net/downloads";
COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
if [[ ${PV} == 9999* ]]
then
EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
http://git.overlays.gentoo.org/gitroot/proj/${PN}.git";
inherit git-2 bash-completion-r1 eutils
S="${WORKDIR}/${PN}"
SRC_URI="${COMMON_URI}"
KEYWORDS=""
else
inherit bash-completion-r1 eutils
SRC_URI="mirror://gentoo/${P}.tar.bz2
${COMMON_URI}"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86"
fi
DESCRIPTION="Gentoo automatic kernel building scripts"
HOMEPAGE="http://www.gentoo.org";
LICENSE="GPL-2"
SLOT="0"
RESTRICT=""
IUSE="crypt cryptsetup ibm selinux" # Keep 'crypt' in to keep 'use crypt'
below working!
DEPEND="sys-fs/e2fsprogs
selinux? ( sys-libs/libselinux )"
RDEPEND="${DEPEND}
cryptsetup? ( sys-fs/cryptsetup )
app-arch/cpio
>=app-misc/pax-utils-0.2.1
!<sys-apps/openrc-0.9.9"
# pax-utils is used for lddtree
if [[ ${PV} == 9999* ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
fi
src_unpack() {
if [[ ${PV} == 9999* ]] ; then
git-2_src_unpack
else
unpack ${P}.tar.bz2
fi
}
src_prepare() {
if [[ ${PV} == 9999* ]] ; then
einfo "Producing ChangeLog from Git history..."
pushd "${S}/.git" >/dev/null || die
git log > "${S}"/ChangeLog || die
popd >/dev/null || die
fi
use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
# Update software.sh
sed -i \
-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-e "s:VERSION_MDADM:$VERSION_MDADM:" \
-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-e "s:VERSION_FUSE:$VERSION_FUSE:" \
-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
-e "s:VERSION_LVM:$VERSION_LVM:" \
-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
-e "s:VERSION_GPG:$VERSION_GPG:" \
"${S}"/defaults/software.sh \
|| die "Could not adjust versions"
epatch_user
}
src_compile() {
if [[ ${PV} == 9999* ]]; then
emake || die
fi
}
src_install() {
insinto /etc
doins "${S}"/genkernel.conf || die "doins genkernel.conf"
doman genkernel.8 || die "doman"
dodoc AUTHORS ChangeLog README TODO || die "dodoc"
dobin genkernel || die "dobin genkernel"
rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
insinto /usr/share/genkernel
doins -r "${S}"/* || die "doins"
use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6
|| \
cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
# Copy files to /var/cache/genkernel/src
GKDISTDIR=/usr/share/genkernel/distfiles/
elog "Copying files to ${GKDISTDIR}..."
insinto $GKDISTDIR
doins "${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2
doins "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2
doins "${DISTDIR}"/LVM2.${VERSION_LVM}.tgz
doins "${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2
doins "${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz
doins "${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
doins "${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2
doins "${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz
newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
insinto /etc
doins "${FILESDIR}"/initramfs.mounts
}
pkg_postinst() {
echo
elog 'Documentation is available in the genkernel manual page'
elog 'as well as the following URL:'
echo
elog 'http://www.gentoo.org/doc/en/genkernel.xml'
echo
ewarn "This package is known to not work with reiser4. If you are
running"
ewarn "reiser4 and have a problem, do not file a bug. We know it does
not"
ewarn "work and we don't plan on fixing it since reiser4 is the one
that is"
ewarn "broken in this regard. Try using a sane filesystem like ext3 or"
ewarn "even reiser3."
echo
ewarn "The LUKS support has changed from versions prior to 3.4.4. Now,"
ewarn "you use crypt_root=/dev/blah instead of
real_root=luks:/dev/blah."
echo
if use crypt && ! use cryptsetup ; then
ewarn "Local use flag 'crypt' has been renamed to 'cryptsetup'
(bug #414523)."
ewarn "Please set flag 'cryptsetup' for this very package if
you would like"
ewarn "to have genkernel create an initramfs with LUKS support."
ewarn "Sorry for the inconvenience."
echo
fi
}
