some jenkernel updates

3 files changed, 90 insertions, 56 deletions

diff --git a/sys-kernel/jenkernel/Manifest b/sys-kernel/jenkernel/Manifest
index bf0e870..ef156bb 100644
--- a/sys-kernel/jenkernel/Manifest
+++ b/sys-kernel/jenkernel/Manifest
@@ -1,12 +1,12 @@
-AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
-DIST LVM2.2.02.74.tgz 943084 RMD160 e5cb2a9e304c4075f05aecd03d67aa53eda9e43e SHA1 fc6cd04e4a908906c6f596ad99948140728be99c SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697
-DIST busybox-1.18.1.tar.bz2 2129404 RMD160 fb40d19103945eb1cd785a6041e5545f4055b8f6 SHA1 83b86858599870e46236da8d370d335d48cee77e SHA256 33eb25ea7b20c727c3af769256b21408a1ac1f927ff9f89a1f1e3767c18c9967
-DIST device-mapper.1.02.22.tgz 189726 RMD160 8bf9986536c49f53c398d6a2180e21e1235bea18 SHA1 a4533872c32951a1b549bb9207a13b7e4dae0701 SHA256 ff833a6cd6246686f5b3f5692fd6597f1ffbc60f08929e5fe68304cdafb61595
-DIST dmraid-1.0.0.rc14.tar.bz2 164234 RMD160 9cd238a981cfef9c5c1f2f1d6466b70c95ec9c7c SHA1 2b3284db46a995967d88993ae5ae36b57c513bc4 SHA256 a777354d6d69a9b58d84966cc7b37bc3f5c89539f885ad25fd874ed1c388fbec
-DIST e2fsprogs-1.41.14.tar.gz 4512157 RMD160 bdd22a93f57de1145007bffd6fc45323098e27e8 SHA1 24f9364fa3d4c0d7d00cb627b819d0e51055d6c5 SHA256 3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176
-DIST fuse-2.7.4.tar.gz 506658 RMD160 fe1808cfd58ad6651259245b424301e99881faa2 SHA1 7a86f5cf39f38e64ccbae093599d64a895b950ba SHA256 c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6
-DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
-DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
-DIST open-iscsi-2.0-872.tar.gz 900081 RMD160 4eacb8a94cf7712f936b52a961fa7f11774dde67 SHA1 96880185791177ba7b8970742572b46ebfe901cd SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f
-DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f6488 SHA1 e95799923ee3938e1fb44c6fd9aa7154d720063e SHA256 fa0c494a8ce63f235601fcc35e3a96527831169d6d5921ee49faccf3b25feb78
-EBUILD jenkernel-9999.ebuild 5215 RMD160 bcceba7e143d5548dcc891840b7a4357963b9006 SHA1 64118ccc14d24e1dba664fe8fe27fa8e05bc5abc SHA256 c48134d4a5bf26ed1a8ad25e24ce4cf7d5e80d817ab51406ea7df90646765603
+AUX genkernel.bash 2438 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248 SHA512 2bfe23606f919577bb2d174ffe18cd00fbb4ce642fb8860b319e059745d46ff8459b99374159f78af9f3aebb0a352a74ccd74c3be581980f5e298293b96e983d WHIRLPOOL 71a6be56d38c24c3032fec5f4016c92dd0bc8140e5204db9d97c5cc5be42a2465282f36e213858b528d013ff74c6bcbf9aa443a77a8ed3ce8174baa79afe6004
+AUX initramfs.mounts 816 SHA256 57ba8450e3f09edc9a4e5a1be15d49c77e4e014e27c626e9e3771167cbb54e49 SHA512 97e5f92d135cff3911a68c7f1afd0f781ec1c1b794cdc824d74f8c119104ecb40bd7180be8414dc72f3a5a811143d6b4bf443ac1d3ff7a71b1e88cbf7c179665 WHIRLPOOL f39d27de6e69b3555f81138a59f25b104f9dd6aa6254a5391d3375b15acaac48f0e698f3e6f96ed88845b84fbf8fa2cd64b98281df977c12a99ec7d9ddaf2a10
+DIST LVM2.2.02.88.tgz 1029151 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b WHIRLPOOL b30a1f2403e71ff6fb381ec82291018632e1d10258dd615efae4e39077a304a66271013247793390f57c26886599d8bad8f4b896d230f3e4f846e74c12282f71
+DIST busybox-1.20.2.tar.bz2 2186738 SHA256 eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882 SHA512 089b67cd920f332daf910711739b1e55ba4c76cfa2122dfe5464432e0d76d3af8327837ebc3cc9954deef3e8f766d16a1928aecb2c169fe3de5a722eea7ea3dd WHIRLPOOL aa8fec92d0ac8bb246dea7353537d425a5fecfa0bb807d0e291c7351e8289b84aab83303c45b75f9b7a98cd10177e210511064f0709425c2f84b069fe6a06420
+DIST dmraid-1.0.0.rc16-3.tar.bz2 232743 SHA256 93421bd169d71ff5e7d2db95b62b030bfa205a12010b6468dcdef80337d6fbd8 SHA512 7c45e5117adc52fc2094b1b2bad4f4c518a46317a2196611966d72085ba3587c4ac8d1080f9d934888c01788f2b2d3d621c6f0d3e2a023c0fb1f9f3fa7fc127e WHIRLPOOL 87915ea0013766da8a9722b437bfe146b4b2c7560a7814ac6caab92054ddc3b4b59ceb4d413609d5eaab92b5cee67886ade7924455f1dba19f1b8dabc25d3498
+DIST dropbear-2012.55.tar.bz2 1581421 SHA256 04982af2a10b220fa940f9f72f276d612c9bb643cfbb5ee1416e5a0f00de9b0f SHA512 34d4b15fc6d46508b5b93a3bf63e4de9de7a72fa3da56fba4815bacbd2df9e683b3f710d71baee492dfb6d3cfb2c6a454f39e3b752649e1024cd160f96fad0a9 WHIRLPOOL 21fed6d08fb92b52e2e520e3f1efde3308594e8de9d73b801230e73e239356053cd3bc811cab8b2a9eb245070fd52e9769d19d1ba3c3cd5c62ce4a517cddbc32
+DIST fuse-2.8.6.tar.gz 505334 SHA256 1ec1913e38f09b2a9ec1579e1800805b5e2c747d1dce515e316dbb665ca139d6 SHA512 03cacc45c8ba6700fcdfa9064ef4e10d3ad6fc0e4fc49d41693de2caf03d44513d449b00a7c5d200d055d9481821252509259f5f3d2d6127fa51957a006a90fd WHIRLPOOL 668c01f5ae9742f3e70248d6d2b57cbeaa0decf93d5f7987550fe54d4ebdb6e445ff841e8d36a60a4824c114651b8a93b118e15b8a00ac30ddc813e583fa2b51
+DIST gnupg-1.4.11.tar.bz2 3407075 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6 SHA512 97e7b8b0f972cc2f7cabdb0e013cbee1c33e7d48407d040cca5c2037e32abe1c2100194be7d3b569d4f05eb16b24c205a5b83f06718f0241f8d4ee174f1c37ae WHIRLPOOL 6f914627e2f527f6616e1f99d2ae06942b734f839d03a45ffa45bf67516a81d58f89e6a85612cf8e5fd83be04ab0b6bc2da8f81114143dad7523e5fcea62366b
+DIST mdadm-3.1.5.tar.bz2 292709 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3 SHA512 6fcf426d63ede01f99ebeee9be686857a04f9b601b37f76722c091ae2999b3ff66fdba52d47323f27900553125a897fc1815fe7be850aa9cc991dd5fa91a5d5d WHIRLPOOL 003595a1338b3a95ccc176b07a31f26dd5fda9460f2c4d3513b9ca09cdab1c91dab05f8914f2354047fccff42c4dcfc6131a383c84467c2838ac7b1af2f9bef8
+DIST open-iscsi-2.0-872.tar.gz 900081 SHA256 37753697a170223ac02a292b3a23a315a3c747b490c42480e4057b676c9f8d4f SHA512 d26c87772b0b1d13a8bd2eea9db86b3c61af83efbb788116c01ab6a914ff3de634a7b1bff56c1161b28965315543edbfc2735b6c7fbd3f7797471fde63b69cc0 WHIRLPOOL 4b04c8481c6c5f094ca6f7761828006a84eda7a22a6b3a4d65e7b3e4b39e73ef839ec710b491e7ca731b047fa8c74a9c03a17e85519a62dfbeb95222cfbdd935
+DIST unionfs-fuse-0.24.tar.bz2 30381 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937 SHA512 e0e414f4edbf641ec9d0135a8723e43fc75412359b482f7aedd66fe8245e4df03943c5ecb6f8de4fdbd97f0346033c691e766cc4f4a755f5b43748e1441d3fbd WHIRLPOOL dc132086d9614895961dc8b498c435145b4390fc80331e0575ee8420faea0201325ab2394b9090d8f721c602ef1f93e150573b1b88b77ee4f7be4a262103b986
+EBUILD jenkernel-9999.ebuild 5307 SHA256 1b5f1ee2853b3710892d7e5693b52c03de42d53f0ffb7e14d10323dcdaead107 SHA512 828042ad03daa4409b131d3ff66730772b5c87d6d98ff6fcd68b95f0de76d8ce6fc00734056924dca52f45077c3e41cec2ac7bddf933f03a80c0ede6c39bcca8 WHIRLPOOL 670cf16a34df0b0e7e2c60b47a62f1969c80c92d7dc2ccb0877f821a4845c493f9ff3ae774eaa6ca02a0dd0011e7aa441441b6ceed349d7a449a1e2334b8b450
diff --git a/sys-kernel/jenkernel/files/initramfs.mounts b/sys-kernel/jenkernel/files/initramfs.mounts
new file mode 100644
index 0000000..b34c675
--- /dev/null
+++ b/sys-kernel/jenkernel/files/initramfs.mounts
@@ -0,0 +1,23 @@
+# This specifies which mounts from your fstab should be mounted before
+# switching to the real root. If this file is missing, genkernel's code will
+# default to just "/usr", which will suffice on most systems with a seperate
+# /usr mount.
+#
+# If you have a complex configuration with a bindmount or symlink at /usr, or
+# need some other mountpoints at boot, you should update this file such that
+# /usr and anything else needed will be available after the switch into the
+# real root.
+#
+# The lines without comments in this file are used as exact matches against the
+# second column of your /etc/fstab and the device, fstype and mount options are
+# taken from that line in fstab. If no line matches, the line from this file
+# will be ignored.
+#
+
+/usr
+
+# If you had some need of these:
+#/usr/local
+#/opt
+#/var
+#/home
diff --git a/sys-kernel/jenkernel/jenkernel-9999.ebuild b/sys-kernel/jenkernel/jenkernel-9999.ebuild
index b9c5e95..6fb8e3a 100644
--- a/sys-kernel/jenkernel/jenkernel-9999.ebuild
+++ b/sys-kernel/jenkernel/jenkernel-9999.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.24 2011/01/23 18:33:09 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-9999.ebuild,v 1.44 2012/11/21 20:03:09 robbat2 Exp $
 
-# genkernel-9999        -> latest Git master
-# genkernel-99999       -> latest Git experimental
+# genkernel-9999        -> latest Git branch "master"
 # genkernel-VERSION     -> normal genkernel release
 
-VERSION_BUSYBOX='1.18.1'
-VERSION_DMAP='1.02.22'
-VERSION_DMRAID='1.0.0.rc14'
-VERSION_MDADM='3.1.4'
-VERSION_E2FSPROGS='1.41.14'
-VERSION_FUSE='2.7.4'
+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.74'
-VERSION_UNIONFS_FUSE='0.22'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
 VERSION_GPG='1.4.11'
+VERSION_DROPBEAR='2012.55'
 
-MY_HOME="http://wolf31o2.org"
 RH_HOME="ftp://sources.redhat.com/pub"
 DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
 BB_HOME="http://www.busybox.net/downloads"
@@ -27,30 +26,24 @@ COMMON_URI="${DM_HOME}/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
-		${RH_HOME}/dm/device-mapper.${VERSION_DMAP}.tgz
-		${RH_HOME}/dm/old/device-mapper.${VERSION_DMAP}.tgz
 		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
 		http://www.open-iscsi.org/bits/open-iscsi-${VERSION_ISCSI}.tar.gz
-		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.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"
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2
+		http://matt.ucc.asn.au/dropbear/releases/dropbear-${VERSION_DROPBEAR}.tar.bz2"
 
 if [[ ${PV} == 9999* ]]
 then
 	EGIT_REPO_URI="git://github.com/jensp/jenkernel.git"
-	[[ ${PV} == 99999* ]] && EGIT_BRANCH=experimental
-	inherit git bash-completion eutils
+	inherit git-2 bash-completion-r1 eutils
 	S="${WORKDIR}/${PN}"
 	SRC_URI="${COMMON_URI}"
 	KEYWORDS=""
 else
-	inherit bash-completion eutils
+	inherit bash-completion-r1 eutils
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		${MY_HOME}/sources/genkernel/${P}.tar.bz2
 		${COMMON_URI}"
-	# 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"
 fi
 
@@ -60,11 +53,16 @@ HOMEPAGE="http://www.gentoo.org"
 LICENSE="GPL-2"
 SLOT="0"
 RESTRICT=""
-IUSE="ibm selinux"
+IUSE="crypt cryptsetup ibm selinux"  # Keep 'crypt' in to keep 'use crypt' below working!
 
 DEPEND="sys-fs/e2fsprogs
 	selinux? ( sys-libs/libselinux )"
-RDEPEND="${DEPEND} app-arch/cpio"
+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"
@@ -72,39 +70,47 @@ fi
 
 src_unpack() {
 	if [[ ${PV} == 9999* ]] ; then
-		git_src_unpack
+		git-2_src_unpack
 	else
 		unpack ${P}.tar.bz2
 	fi
-	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
 }
 
-src_compile() {
-	if [[ ${PV} == 9999* ]]; then
-		emake || die
+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
 
-src_install() {
-	# This block updates genkernel.conf
-	sed \
+	# Update software.sh
+	sed -i \
 		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
-		-e "s:VERSION_DMAP:$VERSION_DMAP:" \
 		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
 		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
-		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
 		-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}"/genkernel.conf > "${T}"/genkernel.conf \
+		"${S}"/defaults/software.sh \
 		|| die "Could not adjust versions"
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
 	insinto /etc
-	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
+	doins "${S}"/genkernel.conf || die "doins genkernel.conf"
 
 	doman genkernel.8 || die "doman"
-	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+	dodoc AUTHORS README TODO || die "dodoc"
 
 	dobin genkernel || die "dobin genkernel"
 
@@ -122,8 +128,6 @@ src_install() {
 		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
 		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
 		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
-		"${DISTDIR}"/device-mapper.${VERSION_DMAP}.tgz \
-		"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
 		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
 		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
 		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
@@ -131,7 +135,9 @@ src_install() {
 		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
 		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
 
-	dobashcompletion "${FILESDIR}"/genkernel.bash
+	newbashcomp "${FILESDIR}"/genkernel.bash "${PN}"
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
 }
 
 pkg_postinst() {
@@ -150,6 +156,11 @@ pkg_postinst() {
 	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
+	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
 }