genkernel: Add extra required distfiles.

2 files changed, 57 insertions, 11 deletions

diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index 86313c4..3d5d871 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -1,8 +1,14 @@
 AUX portmap_compile.sh.patch 737 RMD160 51b637ea419dc42e2262cf006cec95d4cbee5acd SHA1 8a0bd171a6a247df269691bb55fc9c5d33fcffdf SHA256 0adb2a4514f8d9f95be4464e2b6f33f72eb4905fade02fb8698b71a46947c551
 DIST LVM2.2.02.28.tgz 531905 RMD160 bf6f25db6e34bf362353ae9557691a7f01962502 SHA1 6eb2f6e1228b017ad23d0b7f2bb12fd113f96616 SHA256 2d8d7b123e427d0bfb7471d7c17dfd88890eb98257ca22ea3be5d7307e83aceb
+DIST binutils-2.18.tar.bz2 14962245 RMD160 78d07475667c55ecbf9068dbb90362a3445b2a99 SHA1 fdec92e9dfc6c32155869f3910f47041c78e2277 SHA256 487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
+DIST busybox-1.9.0.tar.bz2 1798481 RMD160 ec8dbbda99d0ad2f8e139b2dd5340b8d0762a74b SHA1 adb9409ce37b2f9a8a1a5a6f9ba4fde615c3167b SHA256 2da62c3cfbea0108ba1066b7d56207fa01843a2b30314f3329454700301b28c1
 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.39.tar.gz 3695111 RMD160 67e77a7cbf0e719fa8b5a8ac6285b334e1c3481b SHA1 c2dad0c9bd76701eafe3804e2a7d072aa198f046 SHA256 dc2033447e69a1612881151f6f163e8a3b80e51d16f5e8b3576f3f8ccb325ea3
+DIST gcc-4.2.3.tar.bz2 44455012 RMD160 70b589b79b97967857f2ec70ff8b2017c84c464d SHA1 80b0df13fc9e311868022a3e86e673177397a917 SHA256 5df9a267091eea09179651ad2a2302fe99f780ac7e598278e7f47b2339fa2e80
+DIST gentoo-headers-2.6.24-1.tar.bz2 7393 RMD160 babf5b219a193154c4d33201404a39db486e9a89 SHA1 f1414703e3109346603d3dc39c92dfd6d0b2c6c0 SHA256 0edb9e934f8e6d76dbb5a911b595718a6d516da7561c5012a1ca8d5fbe04c37f
+DIST gentoo-headers-base-2.6.24.tar.bz2 4777944 RMD160 f9ed6d92c6b12d67ecfc3301c2021757c615e0bd SHA1 cfb89d2520d57514e8fb147124832c72405addaf SHA256 891790e5abcc73b82d3e1248b221b73b4592f01d28108b9a3c17f52b9153c3f4
 DIST portmap-6.0.tgz 22251 RMD160 2faf525f2b56e49c5b81a247c256b6c8e91aab72 SHA1 8133aaf1bdb0d0ba0b2d26e116e1e0397a3f027b SHA256 02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de
+DIST uClibc-0.9.29.tar.bz2 2134864 RMD160 2d782f152b57f8b3e2afabec0b739fc83187b20c SHA1 1c5a36dc2cfa58b41db413190e45675c44ca4691 SHA256 ca70501ae859cd86b387bb196908838275b4b06e6f4d692f9aa51b8a633334a7
 DIST unionfs-1.5pre-cvs200701042308.tar.gz 163418 RMD160 6d54be6db26a562dd943df2de9cf0e0138c45c6f SHA1 9559a0ae8e0552a9c3644c85a99c1be601c837fc SHA256 d1925eee22517df72828a7c75890c20a54335e135f6ed04ea43f8771c9b1c271
-EBUILD genkernel-4_pre9999.ebuild 2497 RMD160 af223201e186533265526a922576b0f17f068ceb SHA1 257459dbdc2835e3831b4708f9e0d6ef1741d6da SHA256 fd3d5586c6c40a4c13efea2a29acfe10dacdcd55e1bbcf546f1f43a491604b85
+EBUILD genkernel-4_pre9999.ebuild 3938 RMD160 a3edc7eeaf438f17fa53380551c4a676bfa7d8c7 SHA1 969d0824fc89a6c0b9fffea4fc3fca2d78000b15 SHA256 f6082624ade7f8d57d5c15928fe65f0cbe6fae049936f7d5a6a909a895a38781
diff --git a/sys-kernel/genkernel/genkernel-4_pre9999.ebuild b/sys-kernel/genkernel/genkernel-4_pre9999.ebuild
index 056de10..1326ebb 100644
--- a/sys-kernel/genkernel/genkernel-4_pre9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-4_pre9999.ebuild
@@ -13,7 +13,15 @@ E2FSPROGS_VER='1.39'
 LVM2_VER='2.02.28'
 VERSION_PKG='3.4-r3'
 UNIONFS_VER='1.5pre-cvs200701042308'
+
+# genkernel-4 specific
 PORTMAP_VER='6.0'
+BUSYBOX_VER='1.9.0'
+UCLIBC_VER='0.9.29'
+GCC_VER='4.2.3'
+BINUTILS_VER='2.18'
+KERNEL_HEADERS_VER='2.6.24'
+KERNEL_HEADERS_PATCH_VER='1'
 
 DESCRIPTION="Gentoo automatic kernel building scripts"
 HOMEPAGE="http://www.gentoo.org"
@@ -26,7 +34,14 @@ SRC_URI="
 	ftp://sources.redhat.com/pub/dm/old/device-mapper.${DEVICE_MAPPER_VER}.tgz
 	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-1.x/snapshots/unionfs-${UNIONFS_VER}.tar.gz
 	mirror://sourceforge/e2fsprogs/e2fsprogs-${E2FSPROGS_VER}.tar.gz
-	http://neil.brown.name/portmap/portmap-${PORTMAP_VER}.tgz"
+
+	http://neil.brown.name/portmap/portmap-${PORTMAP_VER}.tgz
+	http://www.busybox.net/downloads/busybox-${BUSYBOX_VER}.tar.bz2
+	http://www.uclibc.org/downloads/uClibc-${UCLIBC_VER}.tar.bz2
+	mirror://gnu/gcc/gcc-${GCC_VER}/gcc-${GCC_VER}.tar.bz2
+	mirror://gnu/binutils/binutils-${BINUTILS_VER}.tar.bz2
+	mirror://gentoo/gentoo-headers-base-${KERNEL_HEADERS_VER}.tar.bz2
+	mirror://gentoo/gentoo-headers-${KERNEL_HEADERS_VER}-${KERNEL_HEADERS_PATCH_VER}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -42,6 +57,31 @@ src_unpack() {
 
 	# New portmap versions have a different tarball naming scheme
 	epatch "${FILESDIR}"/portmap_compile.sh.patch
+
+	pushd "${WORKDIR}" >/dev/null
+
+	# Add kernel header patches to the original tarball, since gk4
+	# doesn't support patching the headers (yet)
+	if ! [[ -e ${DISTDIR}/gentoo-headers-base-${KERNEL_HEADERS_VER}-${KERNEL_HEADERS_PATCH_VER}.tar.bz2 ]]; then
+		unpack gentoo-headers-base-${KERNEL_HEADERS_VER}.tar.bz2
+		unpack gentoo-headers-${KERNEL_HEADERS_VER}-${KERNEL_HEADERS_PATCH_VER}.tar.bz2
+		pushd gentoo-headers-base-${KERNEL_HEADERS_VER} >/dev/null
+		epatch ../${KERNEL_HEADERS_VER}
+		popd >/dev/null
+		mv \
+			gentoo-headers-base-${KERNEL_HEADERS_VER} \
+			linux-headers-${KERNEL_HEADERS_VER} \
+			|| die
+		tar cfj \
+			linux-headers-${KERNEL_HEADERS_VER}.tar.bz2 \
+			linux-headers-${KERNEL_HEADERS_VER} \
+			|| die
+		mv \
+			linux-headers-${KERNEL_HEADERS_VER}.tar.bz2 \
+			"${DISTDIR}"/ \
+			|| die
+	fi
+	popd >/dev/null
 }
 
 src_install() {
@@ -55,6 +95,11 @@ src_install() {
 		-e "s:\(LVM2_VER=\).*:\1$LVM2_VER:" \
 		-e "s:\(UNIONFS_VER=\).*:\1$UNIONFS_VER:" \
 		-e "s:\(PORTMAP_VER=\).*:\1$PORTMAP_VER:" \
+		-e "s:\(BUSYBOX_VER=\).*:\1$BUSYBOX_VER:" \
+		-e "s:\(UCLIBC_VER=\).*:\1$UCLIBC_VER:" \
+		-e "s:\(GCC_VER=\).*:\1$GCC_VER:" \
+		-e "s:\(BINUTILS_VER=\).*:\1$BINUTILS_VER:" \
+		-e "s:\(KERNEL_HEADERS_VER=\).*:\1$KERNEL_HEADERS_VER:" \
 		"${D}"/etc/genkernel/genkernel.conf || die "Could not adjust versions"
 
 	dodir /usr/share/genkernel
@@ -63,13 +108,8 @@ src_install() {
 	rm -f "${D}"/usr/share/genkernel/genkernel.conf
 
 	dodir /usr/share/genkernel/dist
-	cp \
-	"${DISTDIR}"/dmraid-${DMRAID_VER}.tar.bz2 \
-	"${DISTDIR}"/LVM2.${LVM2_VER}.tgz \
-	"${DISTDIR}"/device-mapper.${DEVICE_MAPPER_VER}.tgz \
-	"${DISTDIR}"/unionfs-${UNIONFS_VER}.tar.gz \
-	"${DISTDIR}"/e2fsprogs-${E2FSPROGS_VER}.tar.gz \
-	"${DISTDIR}"/portmap-${PORTMAP_VER}.tgz \
-	"${D}"/usr/share/genkernel/dist \
-	|| die
+	local pkg
+	for pkg in ${A} linux-headers-${KERNEL_HEADERS_VER}.tar.bz2; do
+		cp "${DISTDIR}"/${pkg} "${D}"/usr/share/genkernel/dist || die
+	done
 }