commit: 0b64552ca5105e36cd0ea4257dca3abdbcf2c3d6
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 23:35:55 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 07:02:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b64552c
sys-kernel/genkernel: backport grub-mkconfig change from master, per bug #591200
Package-Manager: portage-2.2.28
.../files/genkernel-3.4.52.4-grub-mkconfig.patch | 17 +++
sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild | 163 +++++++++++++++++++++
2 files changed, 180 insertions(+)
diff --git a/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
new file mode 100644
index 0000000..9e55301
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-3.4.52.4-grub-mkconfig.patch
@@ -0,0 +1,17 @@
+diff --git a/gen_bootloader.sh b/gen_bootloader.sh
+index 4bbd303..fdca749 100755
+--- a/gen_bootloader.sh
++++ b/gen_bootloader.sh
+@@ -49,8 +49,10 @@ set_bootloader_grub2() {
+ fi
+
+ print_info 1 "You can customize Grub2 parameters in /etc/default/grub."
+- print_info 1 "Running grub2-mkconfig to create ${GRUB_CONF}..."
+- grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null || gen_die
"grub2-mkconfig failed"
++ print_info 1 "Running grub-mkconfig to create ${GRUB_CONF}..."
++ grub-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
++ grub2-mkconfig -o "${GRUB_CONF}" 2> /dev/null ||
++ gen_die "grub-mkconfig failed"
+ [ "${BUILD_RAMDISK}" -ne 0 ] && sed -i 's/ro single/ro debug/'
"${GRUB_CONF}"
+ }
+
diff --git a/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
new file mode 100644
index 0000000..0319c77
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.52.4-r2.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# genkernel-9999 -> latest Git branch "master"
+# genkernel-VERSION -> normal genkernel release
+
+EAPI=5 # approved 2012.09.11, required by all profiles since 2014.03.12
+
+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://sourceware.org/pub";
+DM_HOME="https://people.redhat.com/~heinzm/sw/dmraid/src";
+BB_HOME="https://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://anongit.gentoo.org/proj/${PN}.git
+ https://anongit.gentoo.org/git/proj/${PN}.git";
+ inherit git-2 bash-completion-r1 eutils
+ S="${WORKDIR}/${PN}"
+ SRC_URI="${COMMON_URI}"
+else
+ inherit bash-completion-r1 eutils
+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.xz
+ ${COMMON_URI}"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh
~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="https://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.xz
+ 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 "${FILESDIR}"/${P}-system-map.patch #570822
+ epatch "${FILESDIR}"/${P}-grub-mkconfig.patch #591200
+ 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
+
+ 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.xz/}
+}
+
+pkg_postinst() {
+ echo
+ elog 'Documentation is available in the genkernel manual page'
+ elog 'as well as the following URL:'
+ echo
+ elog 'https://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
+}
