New arcboot revision with added patch from Onion that adds in an Interactive shell (-i), isofs/romfs support, what appears to be compressed kernel support, and other odd bits.

(Portage version: 2.0.51.20-r4)

7 files changed, 68 insertions, 68 deletions

diff --git a/sys-boot/arcboot/ChangeLog b/sys-boot/arcboot/ChangeLog
index aec3acf4aa08..8701d2c07e3e 100644
--- a/sys-boot/arcboot/ChangeLog
+++ b/sys-boot/arcboot/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/arcboot
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcboot/ChangeLog,v 1.5 2004/10/27 06:30:48 kumba Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcboot/ChangeLog,v 1.6 2005/04/30 05:21:02 kumba Exp $
+
+*arcboot-0.3.8.6 (30 Apr 2005)
+
+  30 Apr 2005; Joshua Kinard <kumba@gentoo.org> -files/arcboot-gentoo.patch,
+  -arcboot-0.3.8.2.ebuild, +arcboot-0.3.8.6.ebuild:
+  New arcboot revision with added patch from Onion that adds in an Interactive
+  shell (-i), isofs/romfs support, what appears to be compressed kernel support,
+  and other odd bits.
 
 *arcboot-0.3.8.4-r1 (27 Oct 2004)
 
diff --git a/sys-boot/arcboot/Manifest b/sys-boot/arcboot/Manifest
index 9d5712cd8260..be64217ecb6d 100644
--- a/sys-boot/arcboot/Manifest
+++ b/sys-boot/arcboot/Manifest
@@ -1,8 +1,7 @@
-MD5 760336a87df2c31970649fdca52080ef ChangeLog 1287
-MD5 acc84630b73004cfe9c7acf158187164 arcboot-0.3.8.2.ebuild 3972
+MD5 3b8a658435ce9d72b7e65b4bc6bfdd76 ChangeLog 1631
+MD5 929010e0357533752e87653daadc052e arcboot-0.3.8.6.ebuild 4499
+MD5 94bf897517738fcbaebf29ea47c76d56 arcboot-0.3.8.4-r1.ebuild 3857
 MD5 6fb572ed7959ebf0171d2e5e18b31831 metadata.xml 317
-MD5 f9bfd1470f27b225620a19c316f5560c arcboot-0.3.8.4-r1.ebuild 3857
 MD5 48502666c968d002b7c270cfdf982800 files/arcboot-0.3.8.4-gentoo.patch 8052
-MD5 ffbb46ff4240f217c96de74002a6e9eb files/arcboot-gentoo.patch 599
-MD5 5993ec1e9bae04f3a57f094011601c4b files/digest-arcboot-0.3.8.2 67
 MD5 439138ebd60a5a26366ea044e4468b00 files/digest-arcboot-0.3.8.4-r1 67
+MD5 63eed73ee49fcf1daecbe7567b9c55c8 files/digest-arcboot-0.3.8.6 138
diff --git a/sys-boot/arcboot/arcboot-0.3.8.4-r1.ebuild b/sys-boot/arcboot/arcboot-0.3.8.4-r1.ebuild
index 0d342b7eed27..f05cca27cbce 100644
--- a/sys-boot/arcboot/arcboot-0.3.8.4-r1.ebuild
+++ b/sys-boot/arcboot/arcboot-0.3.8.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcboot/arcboot-0.3.8.4-r1.ebuild,v 1.1 2004/10/27 06:30:48 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcboot/arcboot-0.3.8.4-r1.ebuild,v 1.2 2005/04/30 05:21:02 kumba Exp $
 
 inherit eutils
 
diff --git a/sys-boot/arcboot/arcboot-0.3.8.2.ebuild b/sys-boot/arcboot/arcboot-0.3.8.6.ebuild
index d52b85bd3023..ea5e75c21863 100644
--- a/sys-boot/arcboot/arcboot-0.3.8.2.ebuild
+++ b/sys-boot/arcboot/arcboot-0.3.8.6.ebuild
@@ -1,47 +1,58 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcboot/arcboot-0.3.8.2.ebuild,v 1.2 2004/08/13 08:17:17 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcboot/arcboot-0.3.8.6.ebuild,v 1.1 2005/04/30 05:21:02 kumba Exp $
 
 inherit eutils
 
 MY_P="${P/-/_}"
+ARCVER="1.0"		# Version of the arcboot patch ball
 
 DESCRIPTION="ARCS Bootloader for SGI Machines (IP22, IP32)"
 HOMEPAGE="http://packages.qa.debian.org/a/arcboot.html"
-SRC_URI="http://http.us.debian.org/debian/pool/main/a/arcboot/${MY_P}.tar.gz"
+SRC_URI="http://http.us.debian.org/debian/pool/main/a/arcboot/${MY_P}.tar.gz
+		mirror://gentoo/arcboot-patches-${ARCVER}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~mips"
-IUSE=""
+IUSE="ip27 ip28 ip30 cobalt"
 
 DEPEND=""
 RDEPEND="sys-boot/dvhtool
 	 sys-apps/debianutils"
 
-S=${WORKDIR}/${P}
+S=${WORKDIR}/${PN}
 
 pkg_setup() {
 	# arcboot is for SGI mips machines only, so exclude everyone but them
-	if use mips; then
-		if [ "${PROFILE_ARCH}" = "cobalt" ]; then
-			eerror "arcboot is a bootloader only for MIPS machines running"
-			eerror "ARCS firmware, such as SGI Machines.  It is not intended"
-			eerror "for other kinds of MIPS machines."
-			die "Wrong MIPS Machine Type"
-		fi
+	if use cobalt; then
+		eerror "Arcboot is a bootloader only for MIPS machines running"
+		eerror "ARCS firmware, such as SGI Machines.  It is not intended"
+		eerror "for other kinds of MIPS machines."
+		die "Wrong MIPS Machine Type"
+	fi
+
+	# Machines which expect an ELF64 binary to boot can't use arcboot
+	if use ip27 || use ip28 || use ip30; then
+		eerror "Arcboot does not work on systems that can only boot pure 64bit"
+		eerror "ELF binaries.  Arcboot needs some work to be able to compile as"
+		eerror "an ELF64 object.  Patches are welcome!"
+		die "No ELF64 Support"
 	fi
 
 
-	# Set SGI_TARGET properly
+	# Set SGITYPE properly
 	case "$(uname -i)" in
-		"SGI IP32"|"SGI O2")		SGI_TARGET="ip32" ;;
-		"SGI Indy"|"SGI Indigo2")	SGI_TARGET="ip22" ;;
+		"SGI IP32"|"SGI O2")		SGITYPE="IP32" ;;
+		"SGI Indy"|"SGI Indigo2")	SGITYPE="IP22" ;;
 		*)
 			eerror "Unknown SGI Machine type.  It's possible arcboot is not usable for this machine"
 			eerror "type yet.  Feel free to make it work and send patches!"
 			die "Unknown SGI Machine Type"
 			;;
 	esac
+
+	# Lower case SGITYPE
+	SGITYPE_L="$(echo "${SGITYPE}" | tr [A-Z] [a-z])"
 }
 
 src_unpack() {
@@ -49,22 +60,25 @@ src_unpack() {
 	cd ${S}
 
 	# Set the version
-	echo "#define __ARCSBOOT_VERSION__ \"${PV}\"" >> common/version.h
-
-	# O2's PROM does *not* like ECOFF formatted arcboot, and gcc-3.4.x + newer binutils
-	# creates an overlap when doing the final arcboot link.  The below patch fixes this.
-	epatch ${FILESDIR}/arcboot-gentoo.patch
+	echo "#define __ARCSBOOT_VERSION__ \"${PV}\"" > common/version.h
+
+	# Crazy patches.  One is onion's patch, highly modified, from:
+	# http://www.tal.org/~milang/o2/
+	#
+	# Second is a clean up of bits in onion's patch to make it
+	# compile against our headers.
+	epatch ${WORKDIR}/patches/${P}-onion.patch
+	epatch ${WORKDIR}/patches/${P}-gentoo.patch
 }
 
 src_compile() {
 	cd ${S}
-	local sgitype="$(echo "${SGI_TARGET}" | tr [a-z] [A-Z])"
 
 	echo -e ""
-	einfo ">>> Building for ${sgitype} ..."
+	einfo ">>> Building for ${SGITYPE} ..."
 	echo -e ""
 
-	make SUBARCH="${sgitype}" || die
+	make SUBARCH="${SGITYPE}" || die
 }
 
 src_install() {
@@ -72,25 +86,25 @@ src_install() {
 
 	# Arcboot
 	dodir /usr/lib/arcboot
-	cp ext2load/ext2load ${D}/usr/lib/arcboot/arcboot.${SGI_TARGET}
+	cp ext2load/ext2load ${D}/usr/lib/arcboot/arcboot.${SGITYPE_L}
 
-	# Technically, we don't need tip22 (attaches initrd to kernel), as 
+	# Technically, we don't need tip[2|3]2 (attaches initrd to kernel), as 
 	# MIPS kernels support embedding initrd's into kernels at build time,
 	# But maybe this will be useful one day.  Until then, we leave it out.
-##	dodir /usr/lib/tip22
-##	cp tip22/tip22 ${D}/usr/lib/tip22
-##	cp tip22/tftpload.o ${D}/usr/lib/tip22
-##	cp tip22/ld.kernel.script ${D}/usr/lib/tip22
-##	cp tip22/ld.ramdisk.script ${D}/usr/lib/tip22
-##	cp tip22/ld.script ${D}/usr/lib/tip22
-##	cp arclib/libarc.a ${D}/usr/lib/tip22
+	dodir /usr/lib/tip22
+	cp tip22/t${SGITYPE_L} ${D}/usr/lib/tip22
+	cp tip22/tftpload.${SGITYPE}.o ${D}/usr/lib/tip22
+	cp tip22/ld.kernel.script.${SGITYPE} ${D}/usr/lib/tip22
+	cp tip22/ld.ramdisk.script.${SGITYPE} ${D}/usr/lib/tip22
+	cp tip22/ld.script ${D}/usr/lib/tip22
+	cp arclib/libarc.a ${D}/usr/lib/tip22
 
 	# Calling scripts for arcboot/tip22
 	# We also exclude these, since the logic in the debian script may not
 	# work correctly with a gentoo installation.  All the information a 
 	# user needs is provided in the example arcboot.conf, and in pkg_postinst().
 ##	dosbin scripts/arcboot
-##	dosbin tip22/tip22
+	dosbin tip22/t${SGITYPE_L}
 
 	# Conf file
 	dodir /etc
@@ -101,16 +115,16 @@ src_install() {
 	# also has info on setting the PROM option properly as well as arcboot.conf
 	# examples.
 	doman debian/arcboot.8
-##	doman debian/tip22.8
+	doman debian/t${SGITYPE_L}.8
 }
 
 pkg_postinst() {
 	echo -e ""
 	einfo "The arcboot image used to load the kernel from disk has been stored in"
-	einfo "/usr/lib/arcboot/arcboot.${SGI_TARGET}.  To use it, you need to copy this into"
+	einfo "/usr/lib/arcboot/arcboot.${SGITYPE}.  To use it, you need to copy this into"
 	einfo "the volume header with dvhtool:"
 	einfo ""
-	einfo "dvhtool --unix-to-vh /usr/lib/arcboot/arcboot.${SGI_TARGET} arcboot"
+	einfo "dvhtool --unix-to-vh /usr/lib/arcboot/arcboot.${SGITYPE} arcboot"
 	echo -e ""
 	einfo "Next, you need to create an arcboot.conf file.  An example arcboot.conf"
 	einfo "file has been placed in /etc."
diff --git a/sys-boot/arcboot/files/arcboot-gentoo.patch b/sys-boot/arcboot/files/arcboot-gentoo.patch
deleted file mode 100644
index e2203f4026df..000000000000
--- a/sys-boot/arcboot/files/arcboot-gentoo.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- ext2load/Makefile.orig	2004-08-03 00:08:44.000000000 -0400
-+++ ext2load/Makefile	2004-08-03 00:44:43.000000000 -0400
-@@ -25,7 +25,7 @@ ASFLAGS= -mno-abicalls -G 0 -fno-pic
- #CFLAGS+=-DDEBUG
- 
- LD = ld
--LDFLAGS = -N --oformat ecoff-bigmips -T ld.script
-+LDFLAGS = -N --oformat elf32-tradbigmips -T ld.script
- 
- TARGETS = ext2load 
- 
---- ext2load/ld.script.in.orig	2004-08-03 00:08:56.000000000 -0400
-+++ ext2load/ld.script.in	2004-08-03 00:44:52.000000000 -0400
-@@ -9,7 +9,7 @@ SECTIONS
-   .text      :
-   {
-     _ftext = . ;
--    *(.rodata)
-+    *(.rodata*)
-     *(.text)
-   } =0
-   _etext = .;
diff --git a/sys-boot/arcboot/files/digest-arcboot-0.3.8.2 b/sys-boot/arcboot/files/digest-arcboot-0.3.8.2
deleted file mode 100644
index 45f76772530b..000000000000
--- a/sys-boot/arcboot/files/digest-arcboot-0.3.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 21c2814afbc7398fcfe2230848020805 arcboot_0.3.8.2.tar.gz 191209
diff --git a/sys-boot/arcboot/files/digest-arcboot-0.3.8.6 b/sys-boot/arcboot/files/digest-arcboot-0.3.8.6
new file mode 100644
index 000000000000..6c43fdbd3ad3
--- /dev/null
+++ b/sys-boot/arcboot/files/digest-arcboot-0.3.8.6
@@ -0,0 +1,2 @@
+MD5 f9dd44b4cd99b5feca4708e57d89637d arcboot_0.3.8.6.tar.gz 200443
+MD5 d00d8563514809002c0813eca6aff107 arcboot-patches-1.0.tar.bz2 32242