Revision bump to add a modified Debian patch to add netboot support

Package-Manager: portage-2.1.7.17/cvs/Linux ia64

5 files changed, 30 insertions, 143 deletions

diff --git a/sys-boot/aboot/ChangeLog b/sys-boot/aboot/ChangeLog
index 47abc998101c..bafb52b17cc0 100644
--- a/sys-boot/aboot/ChangeLog
+++ b/sys-boot/aboot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/aboot
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.14 2009/09/23 20:29:43 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/ChangeLog,v 1.15 2010/04/04 13:50:52 armin76 Exp $
+
+*aboot-1.0_pre20040408-r3 (04 Apr 2010)
+
+  04 Apr 2010; Raúl Porcel <armin76@gentoo.org> -aboot-0.9-r1.ebuild,
+  -aboot-1.0_pre20040408.ebuild, -aboot-1.0_pre20040408-r1.ebuild,
+  +aboot-1.0_pre20040408-r3.ebuild:
+  Revision bump to add a modified Debian patch to add netboot support
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> aboot-0.9-r1.ebuild,
   aboot-1.0_pre20040408.ebuild:
diff --git a/sys-boot/aboot/Manifest b/sys-boot/aboot/Manifest
index 553c0ccc127a..069b86115c7f 100644
--- a/sys-boot/aboot/Manifest
+++ b/sys-boot/aboot/Manifest
@@ -1,12 +1,10 @@
 AUX aboot-gcc-3.4.patch 830 RMD160 cd9f8a40a648f596fd710dfc9b2057cd481b90a7 SHA1 de8f0f5d586ba25670c6e17fb553a1a90ddf909c SHA256 9757c85226ec5355a849a24a71415604569a7de06036bcfb3e4814fa448b5d18
 AUX aboot-pt_note.patch 8966 RMD160 80d855199f2e4ca8b89858792a3c5f91ea8868b0 SHA1 05581a21648d550f89422ec7f4c93f77d7c2e259 SHA256 ef8a8e20bf482d0aa2cd4da09c867f021018fde486f6c631d7c236d790d81a2b
 AUX aboot.conf 295 RMD160 d42e05161680a9d6f4da91b863737d05d3c72e63 SHA1 36760127c59e3d6c804320f931642033bb4a33e6 SHA256 41372b883807cbd871a5c8f17c4787273f2107ba10be127f73ca9e445ce72ebd
-DIST aboot-0.9bpre.tar.bz2 113731 RMD160 65fb1d574b9572cc31470fa040725182c378a9dc SHA1 27089a80855101ddd28df1ee06f8f85b07a16dbd SHA256 c76d57189d147797ce056aeca712649933e04b00c588a2ab0a6e73ff7096cc95
 DIST aboot-1.0_pre20040408.tar.bz2 115062 RMD160 7ba6619e6cee1d570b5df806a1dbd23b2918303b SHA1 7275dd8435ba4c36aa37e77eebea8b561751d4d4 SHA256 a8ae8f2bf549c1cc79ea66a0a11c8db5c0257ce0d94b97418eb1c658723b12d2
+DIST aboot_gentoo.diff.bz2 9527 RMD160 7e70f37a20f2de262ae8136d65c59c384ba700b0 SHA1 534dc10c6d720a06a3f79b0533e3e2624f8a980a SHA256 6b141b7c90560d07ad740cfb8660a26935acfa96376e73439271d1fa9c6d0730
 DIST gentoo-headers-base-2.6.22.tar.bz2 4700338 RMD160 0742adecc4cf093a2df13c61c3d11e7566f08a9d SHA1 15d4b0508dd871032fe46e15074297f956c768e6 SHA256 da57d0d8d12a59b05f0d3851e6d2f67c413baece046f4ec03831aa70df88710a
-EBUILD aboot-0.9-r1.ebuild 1889 RMD160 b22105aa69da9a5cb9b820584d53bdf56c786f4d SHA1 00e97a836f9b6a75d04ff20bcb9a4b233b9b94c2 SHA256 d1ea7b1c2ded1d4ae5f92ffa1c4ac9305e20dea2695057e3a9d4ffb759c2693a
-EBUILD aboot-1.0_pre20040408-r1.ebuild 2257 RMD160 81441e4ffd9d05b694ba357d4fbc9f5544815b68 SHA1 a3b3cc20faf7ecaac98e230162a5a9cbad457d00 SHA256 3f583afe7bbd9736a660dbde688f31d1e0b207856ab55051c2598a7fd9b8164e
 EBUILD aboot-1.0_pre20040408-r2.ebuild 2395 RMD160 c776e3e6b864a54d402c2b68f8e422ef97c5e4e5 SHA1 221bfd6050758127850a69b2ac978d20a0602571 SHA256 e17810e15a8f0edb7d08fa84ef1698fe2babc32a5416b1fbb936afdad934259f
-EBUILD aboot-1.0_pre20040408.ebuild 1919 RMD160 9cadceccf76368088f77b3ec22af84450e9c9d6b SHA1 5aef99d94597ad55fd5f9d584d5939d22f7ca862 SHA256 957348f39cadccb0ce6d14975cbbe93d8f88f9481e21a508ff76845fe86839ab
-MISC ChangeLog 2525 RMD160 b20d6a81efb0e02e4ae36de1b379ec9516c8c28d SHA1 2cdc1bbcc8475e57d188e2c6c333ce42009f3946 SHA256 6e1e7fbd6e665bf719d3062a2ce2b1175840fd7e82d31945bfe2167ec33e4ee9
+EBUILD aboot-1.0_pre20040408-r3.ebuild 2559 RMD160 c97d629e6340b8c9aec98d9b32c353e560df08c4 SHA1 df8639c96edcf781cac81867da37e34049a64136 SHA256 520768936d691f6e78643163e71911e3a561200da8039ffdece3a15ee57316d5
+MISC ChangeLog 2811 RMD160 f4770948ca502a6318d443785d3465fed86cd932 SHA1 acbbd70ab8ad1567b835682584149eadfed0e9c5 SHA256 521190f786fb54da24215fa9e7f3da7ea1ff2fbdc3b17448f4e30f9dd56fa3aa
 MISC metadata.xml 158 RMD160 e1feed743ecd0f7a4a2abedbef6a662b46969096 SHA1 8a107bbabbd7c2200a345c2e16e8e567d6cefe74 SHA256 6d4f913890738e4843f53f9de89e64faa5eb7d52cbe4c1040693f8ec56d19a31
diff --git a/sys-boot/aboot/aboot-0.9-r1.ebuild b/sys-boot/aboot/aboot-0.9-r1.ebuild
deleted file mode 100644
index 3d88cf67ae22..000000000000
--- a/sys-boot/aboot/aboot-0.9-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-0.9-r1.ebuild,v 1.7 2009/09/23 20:29:43 patrick Exp $
-
-DESCRIPTION="Alpha Linux boot loader for SRM"
-HOMEPAGE="http://aboot.sourceforge.net/"
-SRC_URI="http://aboot.sourceforge.net/tarballs/aboot-0.9bpre.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* alpha"
-IUSE=""
-
-DEPEND=""
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	mv ${WORKDIR}/aboot-0.9bpre ${WORKDIR}/${P}
-	cd ${S}
-	sed -i "s:/usr/man:/usr/share/man:" Makefile || die
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /boot /sbin /usr/share/man/man5
-	make \
-		root=${D} \
-		bindir=${D}/sbin \
-		bootdir=${D}/boot \
-		mandir=${D}/usr/share/man \
-		install
-
-	dodoc ChangeLog INSTALL README TODO aboot.conf
-
-	insinto /etc
-	newins ${FILESDIR}/aboot.conf aboot.conf.example
-}
-
-pkg_postinst() {
-	einfo "To make aboot install a new bootloader on your harddisk follow"
-	einfo "these steps:"
-	einfo ""
-	einfo " - edit the file /etc/aboot.conf"
-	einfo " - cd /boot"
-	einfo " - swriteboot -c2 /dev/sda bootlx"
-	einfo " This will install a new bootsector on /dev/sda and aboot will"
-	einfo " use the second partition on this device to lookup kernel and "
-	einfo " initrd (as described in the aboot.conf file)"
-	einfo ""
-	einfo "IMPORTANT :"
-	einfo ""
-	einfo "The partition table of your boot device has to contain "
-	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
-	einfo "must not be part of a partition as aboot will write its bootloader"
-	einfo "in there and not as with most x86 bootloaders into the "
-	einfo "master boot sector. If your partition table does not reflect this"
-	einfo "you are going to destroy your installation !"
-	einfo "Also note that aboot currently only supports ext2/3 partitions"
-	einfo "to boot from."
-}
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408-r1.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
index af2bd556d08f..953df06342fa 100644
--- a/sys-boot/aboot/aboot-1.0_pre20040408-r1.ebuild
+++ b/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r1.ebuild,v 1.1 2007/07/15 07:07:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408-r3.ebuild,v 1.1 2010/04/04 13:50:52 armin76 Exp $
 
 inherit eutils
 
@@ -9,7 +9,9 @@ KERN_VER="2.6.22"
 DESCRIPTION="Alpha Linux boot loader for SRM"
 HOMEPAGE="http://aboot.sourceforge.net/"
 SRC_URI="http://aboot.sourceforge.net/tarballs/${P}.tar.bz2
-	mirror://gentoo/gentoo-headers-base-${KERN_VER}.tar.bz2"
+	mirror://gentoo/gentoo-headers-base-${KERN_VER}.tar.bz2
+	mirror://gentoo/${PN}_gentoo.diff.bz2
+	http://dev.gentoo.org/~armin76/dist/${PN}_gentoo.diff.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,13 +30,19 @@ src_unpack() {
 	ln -s asm-alpha asm || die
 	touch linux/config.h || die
 	cd "${S}"
-	sed -i '1i#define bool int' cons.c
-	sed -i "s:/usr/man:/usr/share/man:" Makefile || die
 	epatch "${FILESDIR}/aboot-gcc-3.4.patch"
+	epatch "${FILESDIR}/aboot-pt_note.patch"
+	# Modified patch from Debian to add netboot support
+	epatch "${WORKDIR}"/aboot_gentoo.diff
+}
+
+src_compile() {
+	# too many problems with parallel building
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	dodir /boot /sbin /usr/share/man/man5
+	dodir /boot /sbin /usr/share/man/man{1,5,8}
 	make \
 		root="${D}" \
 		bindir="${D}"/sbin \
@@ -42,10 +50,14 @@ src_install() {
 		mandir="${D}"/usr/share/man \
 		install
 
+	insinto /boot
+	doins net_aboot.nh
+	dobin netabootwrap
 	dodoc ChangeLog INSTALL README TODO aboot.conf
 
 	insinto /etc
 	newins "${FILESDIR}"/aboot.conf aboot.conf.example
+
 }
 
 pkg_postinst() {
diff --git a/sys-boot/aboot/aboot-1.0_pre20040408.ebuild b/sys-boot/aboot/aboot-1.0_pre20040408.ebuild
deleted file mode 100644
index babf9d7b7029..000000000000
--- a/sys-boot/aboot/aboot-1.0_pre20040408.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/aboot/aboot-1.0_pre20040408.ebuild,v 1.7 2009/09/23 20:29:43 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="Alpha Linux boot loader for SRM"
-HOMEPAGE="http://aboot.sourceforge.net/"
-SRC_URI="http://aboot.sourceforge.net/tarballs/aboot-1.0_pre20040408.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* alpha"
-IUSE=""
-
-DEPEND=""
-PROVIDE="virtual/bootloader"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:/usr/man:/usr/share/man:" Makefile || die
-	epatch "${FILESDIR}/aboot-gcc-3.4.patch"
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	dodir /boot /sbin /usr/share/man/man5
-	make \
-		root=${D} \
-		bindir=${D}/sbin \
-		bootdir=${D}/boot \
-		mandir=${D}/usr/share/man \
-		install
-
-	dodoc ChangeLog INSTALL README TODO aboot.conf
-
-	insinto /etc
-	newins ${FILESDIR}/aboot.conf aboot.conf.example
-}
-
-pkg_postinst() {
-	einfo "To make aboot install a new bootloader on your harddisk follow"
-	einfo "these steps:"
-	einfo ""
-	einfo " - edit the file /etc/aboot.conf"
-	einfo " - cd /boot"
-	einfo " - swriteboot -c2 /dev/sda bootlx"
-	einfo " This will install a new bootsector on /dev/sda and aboot will"
-	einfo " use the second partition on this device to lookup kernel and "
-	einfo " initrd (as described in the aboot.conf file)"
-	einfo ""
-	einfo "IMPORTANT :"
-	einfo ""
-	einfo "The partition table of your boot device has to contain "
-	einfo "a BSD-DISKLABEL and the first 12 megabytes of your boot device"
-	einfo "must not be part of a partition as aboot will write its bootloader"
-	einfo "in there and not as with most x86 bootloaders into the "
-	einfo "master boot sector. If your partition table does not reflect this"
-	einfo "you are going to destroy your installation !"
-	einfo "Also note that aboot currently only supports ext2/3 partitions"
-	einfo "to boot from."
-}