Revision bumping to add a patch from Robin Johnson <robbat2@gentoo.org> to fix LVM. Closing bug #198546.

(Portage version: 2.1.3.19)

4 files changed, 150 insertions, 1 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index e9afd2ce4971..4852e0fee9f4 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.182 2007/11/14 01:47:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.183 2007/11/16 23:19:58 wolf31o2 Exp $
+
+*genkernel-3.4.9_pre9-r1 (16 Nov 2007)
+
+  16 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  +files/genkernel-3.4.9_pre9-lvm2fix.patch,
+  +genkernel-3.4.9_pre9-r1.ebuild:
+  Revision bumping to add a patch from Robin Johnson <robbat2@gentoo.org> to
+  fix LVM. Closing bug #198546.
 
 *genkernel-3.4.9_pre9 (14 Nov 2007)
 
diff --git a/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre9-r1 b/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre9-r1
new file mode 100644
index 000000000000..9e6a430eb7a7
--- /dev/null
+++ b/sys-kernel/genkernel/files/digest-genkernel-3.4.9_pre9-r1
@@ -0,0 +1,21 @@
+MD5 940a882a71cae84f6befc8069a260ad1 LVM2.2.02.28.tgz 531905
+RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 LVM2.2.02.28.tgz 531905
+SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb LVM2.2.02.28.tgz 531905
+MD5 6b94db57cdc9022af1583b3f2acb91cd device-mapper.1.02.22.tgz 189726
+RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 device-mapper.1.02.22.tgz 189726
+SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595 device-mapper.1.02.22.tgz 189726
+MD5 a0e7d0bb5394e15c878ac86afd72c08e dmraid-1.0.0.rc14.tar.bz2 164234
+RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c dmraid-1.0.0.rc14.tar.bz2 164234
+SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec dmraid-1.0.0.rc14.tar.bz2 164234
+MD5 06f7806782e357797fad1d34b7ced0c6 e2fsprogs-1.39.tar.gz 3695111
+RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b e2fsprogs-1.39.tar.gz 3695111
+SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3 e2fsprogs-1.39.tar.gz 3695111
+MD5 6cbdec361b41c4a940155daf4386d932 genkernel-3.4.9_pre9.tar.bz2 179620
+RMD160 d871d3db7399de30fb660644aaa2b63dd71afee3 genkernel-3.4.9_pre9.tar.bz2 179620
+SHA256 0f6c8c8f04d165c9bbe196081075be7c405e17d6f3af05d75a9111d92bafbd3c genkernel-3.4.9_pre9.tar.bz2 179620
+MD5 8c8d2237555602e9feba657025a12aef genkernel-pkg-3.4-r2.tar.bz2 1909178
+RMD160 49e0fc62c07cfd2f91868087a6703004cd7e1c3f genkernel-pkg-3.4-r2.tar.bz2 1909178
+SHA256 322b840786316a811cb1f4c4f9c589283081205fb0e911e2469ac5cd9682ace5 genkernel-pkg-3.4-r2.tar.bz2 1909178
+MD5 89d736859e5547db1384229160ad5410 unionfs-1.5pre-cvs200701042308.tar.gz 163418
+RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f unionfs-1.5pre-cvs200701042308.tar.gz 163418
+SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271 unionfs-1.5pre-cvs200701042308.tar.gz 163418
diff --git a/sys-kernel/genkernel/files/genkernel-3.4.9_pre9-lvm2fix.patch b/sys-kernel/genkernel/files/genkernel-3.4.9_pre9-lvm2fix.patch
new file mode 100644
index 000000000000..aef395400de7
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-3.4.9_pre9-lvm2fix.patch
@@ -0,0 +1,17 @@
+Index: genkernel.conf
+===================================================================
+--- genkernel.conf	(revision 560)
++++ genkernel.conf	(working copy)
+@@ -155,9 +155,9 @@
+ DEVICE_MAPPER_BINCACHE="%%CACHE%%/device-mapper-${DEVICE_MAPPER_VER}-%%ARCH%%.tar.bz2"
+ 
+ LVM_VER="VERSION_LVM"
+-LVM_DIR="LVM.${LVM_VER}"
+-LVM_SRCTAR="${GK_SHARE}/pkg/LVM.${LVM_VER}.tgz"
+-LVM_BINCACHE="%%CACHE%%/LVM.${LVM_VER}-%%ARCH%%.tar.bz2"
++LVM_DIR="LVM2.${LVM_VER}"
++LVM_SRCTAR="${GK_SHARE}/pkg/LVM2.${LVM_VER}.tgz"
++LVM_BINCACHE="%%CACHE%%/LVM2.${LVM_VER}-%%ARCH%%.tar.bz2"
+ 
+ DMRAID_VER="VERSION_DMRAID"
+ DMRAID_DIR="dmraid/${DMRAID_VER}"
diff --git a/sys-kernel/genkernel/genkernel-3.4.9_pre9-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.9_pre9-r1.ebuild
new file mode 100644
index 000000000000..f912aaa2f8ba
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.9_pre9-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.9_pre9-r1.ebuild,v 1.1 2007/11/16 23:19:58 wolf31o2 Exp $
+
+inherit bash-completion eutils
+
+VERSION_DMAP='1.02.22'
+VERSION_DMRAID='1.0.0.rc14'
+VERSION_E2FSPROGS='1.39'
+VERSION_LVM='2.02.28'
+VERSION_PKG='3.4-r2'
+VERSION_UNIONFS='1.5pre-cvs200701042308'
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	mirror://gentoo/${PN}-pkg-${VERSION_PKG}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/${P}.tar.bz2
+	http://dev.gentoo.org/~wolf31o2/sources/${PN}/${PN}-pkg-${VERSION_PKG}.tar.bz2
+	http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-${VERSION_DMRAID}.tar.bz2
+	http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-${VERSION_DMRAID}.tar.bz2
+	ftp://sources.redhat.com/pub/lvm2/LVM2.${VERSION_LVM}.tgz
+	ftp://sources.redhat.com/pub/lvm2/old/LVM2.${VERSION_LVM}.tgz
+	ftp://sources.redhat.com/pub/dm/device-mapper.${VERSION_DMAP}.tgz
+	ftp://sources.redhat.com/pub/dm/old/device-mapper.${VERSION_DMAP}.tgz
+	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/snapshots/unionfs-${VERSION_UNIONFS}.tar.gz
+	mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
+# Release Engineering, it's easier for us to deal with all arches at once.
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+#KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	cd "${S}"
+	unpack ${PN}-pkg-${VERSION_PKG}.tar.bz2
+	use selinux && sed -i 's/###//g' gen_compile.sh
+	epatch "${FILESDIR}"/${P}-lvm2fix.patch
+}
+
+src_install() {
+	dodir /etc
+	cp "${S}"/genkernel.conf "${D}"/etc
+	# This block updates genkernel.conf
+	sed -i -e "s:VERSION_DMAP:$VERSION_DMAP:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS:$VERSION_UNIONFS:" \
+		"${D}"/etc/genkernel.conf || die "Could not adjust versions"
+
+	dodir /usr/share/genkernel
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/ppc64/kernel-2.6.g5 "${S}"/ppc64/kernel-2.6
+	cp -Rp "${S}"/* "${D}"/usr/share/genkernel
+
+	dodir /usr/bin
+	dosym /usr/share/genkernel/genkernel /usr/bin/genkernel
+
+	rm -f "${D}"/usr/share/genkernel/genkernel.conf
+	dodoc README
+
+	doman genkernel.8
+	rm genkernel.8
+
+	cp "${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+	"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+	"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
+	"${DISTDIR}"/unionfs-${VERSION_UNIONFS}.tar.gz \
+	"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
+	"${D}"/usr/share/genkernel/pkg
+
+	dobashcompletion "${FILESDIR}"/genkernel.bash
+}
+
+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
+
+	bash-completion_pkg_postinst
+}