Revision bump to 1.11, and 1.9/1.10 bumped to stable.

7 files changed, 198 insertions, 18 deletions

diff --git a/sys-boot/colo/ChangeLog b/sys-boot/colo/ChangeLog
index 687e11ecf4b4..53e462b0a2cf 100644
--- a/sys-boot/colo/ChangeLog
+++ b/sys-boot/colo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-boot/colo
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.8 2004/07/27 17:28:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.9 2004/08/02 09:35:41 kumba Exp $
+
+*colo-1.11 (02 Aug 2004)
+
+  02 Aug 2004; Joshua Kinard <kumba@gentoo.org>
+  +files/colo-linker-overlap-fix.patch, colo-1.10.ebuild, +colo-1.11.ebuild,
+  colo-1.9.ebuild:
+  Revision bump to 1.11, and 1.9/1.10 bumped to stable.
 
   28 Jun 2004; Joshua Kinard <kumba@gentoo.org> colo-1.4.ebuild,
   colo-1.6.ebuild, colo-1.8.ebuild:
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index 1d23e3fcdc98..5b5205119383 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -1,15 +1,18 @@
-MD5 8827f810afdc59f57a941bb8b88d6194 colo-1.9.ebuild 3100
+MD5 c4516fa67eff6f85d167af5a08b81dff ChangeLog 1474
 MD5 4826441af3e4f1e696ac41ed4dc0c543 colo-1.4.ebuild 3316
 MD5 817df44df37e021b37ec8d3b2ae5866f colo-1.6.ebuild 3042
 MD5 f723317f072d5b1a839642b6e9a5c886 colo-1.8.ebuild 3096
-MD5 2f0bb3bcf579bfb6caa80d948f0bc055 colo-1.10.ebuild 3098
-MD5 737d44f7f27a1501b417cb64adaab1e7 ChangeLog 1247
+MD5 cedfab6506090c2c45ecbe5cad5881d4 colo-1.9.ebuild 3099
 MD5 821bbe104fd36eab5f08495277bc5adb metadata.xml 364
-MD5 da6cc3a10feca032228e456bd9e77502 files/colo-1.6-gentoo.patch 1285
-MD5 6a9e242bf3b159c4ead248ff40151b32 files/default.boot.example 9
+MD5 e8e1cdf0f31de912564757dc81b5c4df colo-1.10.ebuild 3055
+MD5 a9508a3b610df72e181d722a8e904db2 colo-1.11.ebuild 3580
 MD5 9f076059dca1f289e170da5afd3e7f30 files/digest-colo-1.10 61
 MD5 c1b257fb8b0e15a8f27cbef798f5aede files/colo-1.4-gentoo.patch 2631
+MD5 da6cc3a10feca032228e456bd9e77502 files/colo-1.6-gentoo.patch 1285
+MD5 6a9e242bf3b159c4ead248ff40151b32 files/default.boot.example 9
 MD5 7c11a1ef9a1547e23ae00c09ef797d11 files/digest-colo-1.4 63
 MD5 68f29ebc1f7fc45aaf0b1a75db19a3e5 files/digest-colo-1.6 60
 MD5 8d935262da6b9a313b6dd36c04cc441a files/digest-colo-1.8 60
 MD5 75b80c5c0056c4f9ccd4b18f783a34c9 files/digest-colo-1.9 60
+MD5 bcfba587298a2f1a3dd4c186dbc1ce0d files/colo-linker-overlap-fix.patch 1489
+MD5 c5c9112560e049209e3cf4226a5b7ddc files/digest-colo-1.11 61
diff --git a/sys-boot/colo/colo-1.10.ebuild b/sys-boot/colo/colo-1.10.ebuild
index 3dc99f62540a..a21c7e9a427d 100644
--- a/sys-boot/colo/colo-1.10.ebuild
+++ b/sys-boot/colo/colo-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.10.ebuild,v 1.1 2004/06/26 01:02:58 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.10.ebuild,v 1.2 2004/08/02 09:35:41 kumba Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.colonel-panic.org/cobalt-mips/"
 SRC_URI="http://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 IUSE=""
 DEPEND=""
 RESTRICT="nostrip"
@@ -27,14 +27,13 @@ pkg_setup() {
 	fi
 }
 
-# Not needed for this release, maybe others...
-#src_unpack() {
-#	unpack ${A}
-#
-#	# patch Docs
-#	cd ${S}
-#	epatch ${FILESDIR}/${P}-gentoo.patch
-#}
+src_unpack() {
+	unpack ${A}
+
+	# patch Docs
+	cd ${S}
+	epatch ${FILESDIR}/colo-linker-overlap-fix.patch
+}
 
 src_compile() {
 	# boot-loader
diff --git a/sys-boot/colo/colo-1.11.ebuild b/sys-boot/colo/colo-1.11.ebuild
new file mode 100644
index 000000000000..ab974a79ee04
--- /dev/null
+++ b/sys-boot/colo/colo-1.11.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.11.ebuild,v 1.1 2004/08/02 09:35:41 kumba Exp $
+
+inherit eutils
+
+DESCRIPTION="CObalt Linux lOader - Modern bootloader for Cobalt MIPS machines"
+HOMEPAGE="http://www.colonel-panic.org/cobalt-mips/"
+SRC_URI="http://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~mips"
+IUSE=""
+DEPEND=""
+RESTRICT="nostrip"
+
+
+pkg_setup() {
+	# See if we're on a cobalt system (must use the cobalt-mips profile)
+	if [ "${PROFILE_ARCH}" != "cobalt" ]; then
+		echo -e ""
+		eerror "This package is only intended for the Cobalt Microserver MIPS-based"
+		eerror "systems.  It will not function on any other MIPS-based system or any"
+		eerror "other architecture"
+		echo -e ""
+		die
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# patch Docs
+	cd ${S}
+	epatch ${FILESDIR}/colo-linker-overlap-fix.patch
+}
+
+src_compile() {
+	# boot-loader
+	echo -e ""
+	einfo ">>> Building the CoLo Bootloader ..."
+	cd ${S}
+	make clean || die	# emake breaks the build
+	make || die
+
+	# flash-tool
+	echo -e ""
+	einfo ">>> Building flash-tool ..."
+	cd ${S}/tools/flash-tool
+	make clean || die
+	make || die
+
+	# colo-perm
+	echo -e ""
+	einfo ">>> Building colo-perm ..."
+	cd ${S}/tools/colo-perm
+	make clean || die
+	make || die
+
+	# md5rom
+	echo -e ""
+	einfo ">>> Building md5rom ..."
+	cd ${S}/tools/md5rom
+	make clean || die
+	make || die
+}
+
+src_install() {
+	# bins
+	cd ${S}
+	dodir /usr/lib/colo
+	cp binaries/colo-chain.elf ${D}/usr/lib/colo
+	cp binaries/colo-rom-image.bin ${D}/usr/lib/colo
+	cp ${FILESDIR}/default.boot.example ${D}/usr/lib/colo/default.colo.example
+
+	# docs
+	dodoc CHANGES COPYING INSTALL README README.{restore,shell} TODO
+
+	# flash-tool
+	dosbin tools/flash-tool/flash-tool
+	doman tools/flash-tool/flash-tool.8
+
+	# colo-perm
+	dosbin tools/colo-perm/colo-perm
+	doman tools/colo-perm/colo-perm.8
+
+	# md5rom
+	dosbin tools/md5rom/md5rom
+	doman tools/md5rom/md5rom.8
+}
+
+pkg_postinst() {
+	echo -e ""
+	einfo "Binaries for this bootloader have been stored in"
+	einfo "/usr/lib/cobalt-bootloader.  Documentation has been"
+	einfo "installed in /usr/share/doc/${PF}.  The flash utility"
+	einfo "has been installed as /usr/sbin/flash-tool.  An example"
+	einfo "default.colo has been placed in /usr/lib/colo.  It is"
+	einfo "a script file the bootloader uses to execute a series"
+	einfo "of commands to load the machine.  If you desire the"
+	einfo "machine to boot to the bootloader command prompt, copy"
+	einfo "/usr/lib/colo/default.colo.example to /boot/default.colo,"
+	einfo "otherwise the bootloader will attempt to automatically"
+	einfo "boot /boot/vmlinux.gz.  It is recommended that you edit"
+	einfo "the default.colo.example script to fit your needs and"
+	einfo "place it in /boot as default.colo."
+	echo -e ""
+	ewarn "Note: It is HIGHLY recommended that you use the chain"
+	ewarn "bootloader (colo-chain.elf) first before attempting to"
+	ewarn "write the bootloader to the flash chip to verify that"
+	ewarn "it will work for you.  It is also recommended that"
+	ewarn "you read the documentation in /usr/share/doc/${PF}"
+	ewarn "as it explains how to properly use this package."
+	echo -e ""
+	eerror "Warning: Make sure that IF you plan on flashing the"
+	eerror "bootloader into the flash chip that you are using a"
+	eerror "modern 2.4 Linux kernel (i.e., >2.4.18), otherwise"
+	eerror "you run a risk of destroying the contents of the"
+	eerror "flash chip and rendering the machine unusable."
+	echo -e ""
+	echo -e ""
+}
diff --git a/sys-boot/colo/colo-1.9.ebuild b/sys-boot/colo/colo-1.9.ebuild
index 01992af31e62..f684ae2856a0 100644
--- a/sys-boot/colo/colo-1.9.ebuild
+++ b/sys-boot/colo/colo-1.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.9.ebuild,v 1.2 2004/06/24 22:33:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.9.ebuild,v 1.3 2004/08/02 09:35:41 kumba Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.colonel-panic.org/cobalt-mips/"
 SRC_URI="http://www.colonel-panic.org/cobalt-mips/colo/colo-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~mips"
+KEYWORDS="-* mips"
 IUSE=""
 DEPEND=""
 RESTRICT="nostrip"
diff --git a/sys-boot/colo/files/colo-linker-overlap-fix.patch b/sys-boot/colo/files/colo-linker-overlap-fix.patch
new file mode 100644
index 000000000000..a839da19a88e
--- /dev/null
+++ b/sys-boot/colo/files/colo-linker-overlap-fix.patch
@@ -0,0 +1,48 @@
+diff -Naurp colo-1.10.orig/chain/colo-chain.lnk colo-1.10/chain/colo-chain.lnk
+--- colo-1.10.orig/chain/colo-chain.lnk	2004-04-18 14:26:35.000000000 -0400
++++ colo-1.10/chain/colo-chain.lnk	2004-08-02 03:05:19.000000000 -0400
+@@ -16,7 +16,7 @@ SECTIONS
+ 	{
+ 		start.o(.text)
+ 		*(.text)
+-		*(.rodata)
++		*(.rodata*)
+ 		__stage2 = .;
+ 		*(.stage2)
+ 	}
+diff -Naurp colo-1.10.orig/stage1/Makefile colo-1.10/stage1/Makefile
+--- colo-1.10.orig/stage1/Makefile	2004-05-23 08:34:41.000000000 -0400
++++ colo-1.10/stage1/Makefile	2004-08-02 03:06:48.000000000 -0400
+@@ -35,7 +35,7 @@ clean:
+ 	rm -f $(TARG){,.bin,.map} $(OBJS)
+ 
+ $(TARG).bin: $(TARG)
+-	objcopy -O binary $^ $@
++	objcopy -O binary --adjust-vma -0xbfc00000 $^ $@
+ 
+ $(TARG): $(OBJS)
+ 	$(LD) -T $@.lnk -Map $@.map -o $@ $^
+diff -Naurp colo-1.10.orig/stage1/colo-rom-image.lnk colo-1.10/stage1/colo-rom-image.lnk
+--- colo-1.10.orig/stage1/colo-rom-image.lnk	2004-04-18 14:26:37.000000000 -0400
++++ colo-1.10/stage1/colo-rom-image.lnk	2004-08-02 03:05:34.000000000 -0400
+@@ -38,7 +38,7 @@ SECTIONS
+ 		__text = .;
+ 		start.o(.text)
+ 		*(.text)
+-		*(.rodata)
++		*(.rodata*)
+ 		__stage2 = .;
+ 		*(.stage2)
+ 		__etext = .;
+diff -Naurp colo-1.10.orig/stage2/stage2.lnk colo-1.10/stage2/stage2.lnk
+--- colo-1.10.orig/stage2/stage2.lnk	2004-04-18 14:26:39.000000000 -0400
++++ colo-1.10/stage2/stage2.lnk	2004-08-02 03:05:45.000000000 -0400
+@@ -14,7 +14,7 @@ SECTIONS
+ 	{
+ 		__text = .;
+ 		*(.text)
+-		*(.rodata)
++		*(.rodata*)
+ 	}
+ 
+ 	.data :
diff --git a/sys-boot/colo/files/digest-colo-1.11 b/sys-boot/colo/files/digest-colo-1.11
new file mode 100644
index 000000000000..d76c315f5219
--- /dev/null
+++ b/sys-boot/colo/files/digest-colo-1.11
@@ -0,0 +1 @@
+MD5 0528bbc5d64d1fa1851fb71ac2dc4146 colo-1.11.tar.gz 216716