sys-kernel/genkernel: Integrate patch allowing compilation of busybox 1.7.4 with make 3.82 (bug #341943)

Package-Manager: portage-2.1.9.25/cvs/Linux x86_64

4 files changed, 196 insertions, 2 deletions

diff --git a/sys-kernel/genkernel/ChangeLog b/sys-kernel/genkernel/ChangeLog
index 0d5067e0e63e..3b1234cef0c7 100644
--- a/sys-kernel/genkernel/ChangeLog
+++ b/sys-kernel/genkernel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/genkernel
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.223 2010/09/11 16:48:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/ChangeLog,v 1.224 2010/11/29 09:09:53 sping Exp $
+
+*genkernel-3.4.10.907-r1 (29 Nov 2010)
+
+  29 Nov 2010; <sping@gentoo.org> +files/busybox-1.7.4-make-3.82.patch,
+  +genkernel-3.4.10.907-r1.ebuild:
+  Integrate patch allowing compilation of busybox 1.7.4 with make 3.82 (bug
+  #341943)
 
   11 Sep 2010; Raúl Porcel <armin76@gentoo.org>
   -genkernel-3.4.10.904.ebuild, -genkernel-3.4.10.905.ebuild,
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 619ac668a748..8e925240deab 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,3 +1,4 @@
+AUX busybox-1.7.4-make-3.82.patch 1287 RMD160 c75fc032e11ed780bc949bedb89a230f253faa66 SHA1 a6053a3d8ae1ed5dc3808f4aab8807ea6c483c12 SHA256 3ac639a80426018c77e7c1fe0ab9df4aa771332d3673ceb61fad0c26d8c4184f
 AUX genkernel.bash 2438 RMD160 b3d8e4436d8768c07d18c5aaff9c14fc16641729 SHA1 e15a9c6ef506aa6872a6a97d26751246dedded04 SHA256 e7de9771ba79ef878e2c9a21a1c1720f092c6047d3cc7d4a49ff6b90e7e2c248
 DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
 DIST busybox-1.7.4.tar.bz2 1727940 RMD160 a4b71a246449f88a59acda6ecf019f66b9b7c19b SHA1 e5dcaa25525ca63663c3d4e7027897fed54a4f95 SHA256 8480a7c1b9ac0fddff55e8daae807ccf0a47aa292137fa8c9f97cf0733b459c7
@@ -14,7 +15,8 @@ DIST unionfs-fuse-0.22.tar.bz2 27355 RMD160 f29cbf41af0ba8f2181ac565a6663871676f
 EBUILD genkernel-3.4.10-r1.ebuild 4229 RMD160 92d234b2be60e01421972426074bc506b5f73cf3 SHA1 0abf12e81d1126f89b3876aca19cb7557d30910a SHA256 8fad9aea82669b8cd0e0456c5ddd9d83eb84e69601b43ac07358ea64eb0bf215
 EBUILD genkernel-3.4.10-r2.ebuild 4236 RMD160 2fc33a6a34ffb26128c7b439ab5d6db0092ac581 SHA1 1915949fcbb068a1b160e0351d94ea0003c1d8cb SHA256 c6bab20875b998fb40abd8e4240e38626aeea3ad4b7f40ac2ae80229dd0943ed
 EBUILD genkernel-3.4.10.906.ebuild 4614 RMD160 8d2c50c54cb766fd877a7fd276f0e94256184bd4 SHA1 309f79be4895dba64cebcb3ad253c7c0ca46fbff SHA256 355b909d0725a3dafa5e15f03b8bbab2a9c682607acde15b8e43030040f41b56
+EBUILD genkernel-3.4.10.907-r1.ebuild 5039 RMD160 8b5fa07410fbbc7542c2a8c578fab56a205947c7 SHA1 d90f5830e5e0dcf74035a2ff68cff196b36ac18a SHA256 1583a8d87ba5bf754fbf45bfc1b32f686d628f01658da15495e385749c00a366
 EBUILD genkernel-3.4.10.907.ebuild 4826 RMD160 09e655066424514f5e515e25e0fb113694f64054 SHA1 c17fac118cf7905d3dc0c6df6578486194d75328 SHA256 30a42593a475f49a1fea5cba4b6c36c0421b86a0053e8b7d6f03442f2c4c3aec
 EBUILD genkernel-9999.ebuild 4827 RMD160 6280b0b230b3cb8fe87cc4f8c7e90bf668e845f7 SHA1 4c2024fa404bce237cb0d8bbaafb77b0e3b19a09 SHA256 ad0222481eabce4a3f9b4a828ee27dddfcc9fe56d58be1eeb9960cd396cba12d
-MISC ChangeLog 42604 RMD160 d4fb2868ae07ccf6ed516964030c86087d80e62f SHA1 88d8503ccdfa6a7b27c048ea1e3a29b1371c190f SHA256 8335f373c9ee63260a55b40c28bc652ee4d4a94a94e2c6c6a4feb399b54356fa
+MISC ChangeLog 42837 RMD160 75322edddc6ff64e9445f8d4c37723739b884acd SHA1 f12b29c193968bf78d2a0332adba359e9ce6e368 SHA256 126e1520c66b79b413639b5598b01f3b017380e399395eb6e7592459b6f08a6a
 MISC metadata.xml 226 RMD160 8c8b08effbb307ff307346f319d8e7ec6baddd6e SHA1 33172dd797d80d11d35a2b1855e54cd2a737548d SHA256 b7b060498e250d9de733cf433899caf8e8607fac9fa648f84f5c0512a89d794b
diff --git a/sys-kernel/genkernel/files/busybox-1.7.4-make-3.82.patch b/sys-kernel/genkernel/files/busybox-1.7.4-make-3.82.patch
new file mode 100644
index 000000000000..0559761ffed7
--- /dev/null
+++ b/sys-kernel/genkernel/files/busybox-1.7.4-make-3.82.patch
@@ -0,0 +1,42 @@
+From d508d972c7f808eec5139255f661d37817c79260 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Mon, 29 Nov 2010 09:52:22 +0100
+Subject: [PATCH] Split implicit and normal rules for make 3.82
+
+---
+ Makefile |   12 ++++++++++--
+ 1 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1fe21b..a2bfe4b 100644
+--- Makefile
++++ Makefile
+@@ -402,7 +402,12 @@ ifeq ($(config-targets),1)
+ -include $(srctree)/arch/$(ARCH)/Makefile
+ export KBUILD_DEFCONFIG
+ 
+-config %config: scripts_basic outputmakefile FORCE
++config: scripts_basic outputmakefile FORCE
++	$(Q)mkdir -p include
++	$(Q)$(MAKE) $(build)=scripts/kconfig $@
++	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
++
++%config: scripts_basic outputmakefile FORCE
+ 	$(Q)mkdir -p include
+ 	$(Q)$(MAKE) $(build)=scripts/kconfig $@
+ 	$(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+@@ -1239,7 +1244,10 @@ endif
+ 	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
+ 
+ # Modules
+-/ %/: prepare scripts FORCE
++/: prepare scripts FORCE
++	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
++	$(build)=$(build-dir)
++%/: prepare scripts FORCE
+ 	$(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+ 	$(build)=$(build-dir)
+ %.ko: prepare scripts FORCE
+-- 
+1.7.3.2
+
diff --git a/sys-kernel/genkernel/genkernel-3.4.10.907-r1.ebuild b/sys-kernel/genkernel/genkernel-3.4.10.907-r1.ebuild
new file mode 100644
index 000000000000..56b5bf2e193c
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.10.907-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.10.907-r1.ebuild,v 1.1 2010/11/29 09:09:53 sping Exp $
+
+# genkernel-9999        -> latest SVN
+# genkernel-9999.REV    -> use SVN REV
+# genkernel-VERSION     -> normal genkernel release
+
+VERSION_BUSYBOX='1.7.4'
+VERSION_DMAP='1.02.22'
+VERSION_DMRAID='1.0.0.rc14'
+VERSION_E2FSPROGS='1.40.9'
+VERSION_FUSE='2.7.4'
+VERSION_ISCSI='2.0-871'
+VERSION_LVM='2.02.28'
+VERSION_UNIONFS_FUSE='0.22'
+
+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"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.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"
+
+if [[ ${PV} == 9999* ]]
+then
+	[[ ${PV} == 9999.* ]] && ESVN_UPDATE_CMD="svn up -r ${PV/9999./}"
+	EGIT_REPO_URI="git://git.wolf31o2.org/projs/genkernel.git"
+	#EGIT_BRANCH=''
+	inherit git bash-completion eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+else
+	inherit bash-completion eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${MY_HOME}/sources/genkernel/${P}.tar.bz2
+		${COMMON_URI}"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+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"
+#KEYWORDS=""
+IUSE="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND} app-arch/cpio"
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+}
+
+src_install() {
+	# This block updates genkernel.conf
+	sed \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_DMAP:$VERSION_DMAP:" \
+		-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:" \
+		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
+		|| die "Could not adjust versions"
+	insinto /etc
+	doins "${T}"/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
+	elog "Copying files to /var/cache/genkernel/src..."
+	mkdir -p "${D}"/var/cache/genkernel/src
+	cp -f \
+		"${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 \
+		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	dobashcompletion "${FILESDIR}"/genkernel.bash
+
+	insinto /usr/share/genkernel/patches/busybox/1.7.4
+	# Keeping same name as attachment of bug #341943 to smooth updating
+	newins "${FILESDIR}"/busybox-1.7.4-make-3.82.patch 1.7.4-make-3.82.diff || die
+}
+
+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
+}