New colo revision, cleaned up older revisions, Marked 1.11 stable.

19 files changed, 117 insertions, 565 deletions

diff --git a/sys-boot/colo/ChangeLog b/sys-boot/colo/ChangeLog
index 53e462b0a2cf..2388cdb1257a 100644
--- a/sys-boot/colo/ChangeLog
+++ b/sys-boot/colo/ChangeLog
@@ -1,6 +1,15 @@
 # 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.9 2004/08/02 09:35:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.10 2004/09/03 06:19:03 kumba Exp $
+
+*colo-1.13 (03 Sep 2004)
+
+  03 Sep 2004; Joshua Kinard <kumba@gentoo.org> -files/colo-1.4-gentoo.patch,
+  -files/colo-1.6-gentoo.patch, -files/default.boot.example,
+  +files/default.colo, +files/menu-linux.colo, -colo-1.10.ebuild,
+  colo-1.11.ebuild, +colo-1.13.ebuild, -colo-1.4.ebuild, -colo-1.6.ebuild,
+  -colo-1.8.ebuild, -colo-1.9.ebuild:
+  New colo revision, cleaned up older revisions, Marked 1.11 stable.
 
 *colo-1.11 (02 Aug 2004)
 
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index 392740021bfd..6b94e95379df 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -1,18 +1,9 @@
-MD5 0cba637d8e5be2e207cee8ff2433cbd5 ChangeLog 1475
-MD5 4826441af3e4f1e696ac41ed4dc0c543 colo-1.4.ebuild 3316
-MD5 817df44df37e021b37ec8d3b2ae5866f colo-1.6.ebuild 3042
-MD5 f723317f072d5b1a839642b6e9a5c886 colo-1.8.ebuild 3096
-MD5 47996cf05214fe79b61de70e2375c9b8 colo-1.9.ebuild 3096
+MD5 6bef6bb58bff0b380a49010f5174e28f ChangeLog 1889
 MD5 821bbe104fd36eab5f08495277bc5adb metadata.xml 364
-MD5 12c4ca771cb7b894702b871942519c5b colo-1.10.ebuild 3055
-MD5 e46d57ea61adf42de8aef5d56c037071 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 3f34617bd22946e9fcf557e3fa32602c colo-1.11.ebuild 3144
+MD5 3e88b82d8b8549b4cbd8916c07ae4589 colo-1.13.ebuild 3786
+MD5 3a2004f193ec415c0087691d913c92db files/digest-colo-1.13 61
 MD5 bcfba587298a2f1a3dd4c186dbc1ce0d files/colo-linker-overlap-fix.patch 1489
 MD5 c5c9112560e049209e3cf4226a5b7ddc files/digest-colo-1.11 61
+MD5 887b7cc9e154a546edceffc8ecedc9fd files/default.colo 840
+MD5 216fc6b6d9c407532a57bf484d8fe7d3 files/menu-linux.colo 286
diff --git a/sys-boot/colo/colo-1.11.ebuild b/sys-boot/colo/colo-1.11.ebuild
index ab974a79ee04..5758874dbdee 100644
--- a/sys-boot/colo/colo-1.11.ebuild
+++ b/sys-boot/colo/colo-1.11.ebuild
@@ -1,15 +1,15 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.11.ebuild,v 1.2 2004/09/03 06:19:03 kumba Exp $
 
 inherit eutils
 
-DESCRIPTION="CObalt Linux lOader - Modern bootloader for Cobalt MIPS machines"
+DESCRIPTION="CObalt 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"
+KEYWORDS="-* mips"
 IUSE=""
 DEPEND=""
 RESTRICT="nostrip"
@@ -91,19 +91,15 @@ src_install() {
 
 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."
+	einfo "Install locations:"
+	einfo "   Binaries:\t/usr/lib/${PN}"
+	einfo "   Docs:\t/usr/share/doc/${PF}"
+	einfo "   Tools:\t/usr/bin/{flash-tool,colo-perm,md5rom}"
+	einfo "   Scripts:\t/usr/lib/${PN}/scripts"
+	echo -e ""
+	einfo "Please read the docs to fully understand the behavior of this bootloader, and"
+	einfo "edit the boot scripts to suit your needs."
+	echo -e ""
 	echo -e ""
 	ewarn "Note: It is HIGHLY recommended that you use the chain"
 	ewarn "bootloader (colo-chain.elf) first before attempting to"
diff --git a/sys-boot/colo/colo-1.10.ebuild b/sys-boot/colo/colo-1.13.ebuild
index a21c7e9a427d..782603ebb79a 100644
--- a/sys-boot/colo/colo-1.10.ebuild
+++ b/sys-boot/colo/colo-1.13.ebuild
@@ -1,15 +1,15 @@
 # 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.2 2004/08/02 09:35:41 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.13.ebuild,v 1.1 2004/09/03 06:19:03 kumba Exp $
 
 inherit eutils
 
-DESCRIPTION="CObalt Linux lOader - Modern bootloader for Cobalt MIPS machines"
+DESCRIPTION="CObalt 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"
+KEYWORDS="-* ~mips"
 IUSE=""
 DEPEND=""
 RESTRICT="nostrip"
@@ -33,18 +33,42 @@ src_unpack() {
 	# patch Docs
 	cd ${S}
 	epatch ${FILESDIR}/colo-linker-overlap-fix.patch
+
+	# cp the bootscripts to WORKDIR
+	cp ${FILESDIR}/menu-linux.colo ${FILESDIR}/menu-linuxold.colo ${WORKDIR}
+
+	# sed the primary boot script and stick the current colo version in there
+	sed "s:@COLOVER@:${PV}:g" ${FILESDIR}/default.colo > ${WORKDIR}/default.colo
 }
 
 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() {
@@ -53,30 +77,43 @@ src_install() {
 	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
+
+	# bootscripts
+	dodir /usr/lib/colo/scripts
+	cp ${WORKDIR}/default.colo ${WORKDIR}/menu-linux.colo ${D}/usr/lib/colo/scripts
 }
 
 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."
+	einfo "Install locations:"
+	einfo "   Binaries:\t/usr/lib/${PN}"
+	einfo "   Docs:\t/usr/share/doc/${PF}"
+	einfo "   Tools:\t/usr/bin/{flash-tool,colo-perm,md5rom}"
+	einfo "   Scripts:\t/usr/lib/${PN}/scripts"
+	echo -e ""
+	einfo "Please read the docs to fully understand the behavior of this bootloader, and"
+	einfo "edit the boot scripts to suit your needs."
+	echo -e ""
+	ewarn "Users installing ${PN} for the first time need to be aware that newer"
+	ewarn "versions of ${PN} disable the serial port by default.  If the serial port"
+	ewarn "is needed, select it from the boot menu.  Users using the example boot"
+	ewarn "scripts provided will have the serial port automatically enabled."
+	echo -e ""
 	echo -e ""
 	ewarn "Note: It is HIGHLY recommended that you use the chain"
 	ewarn "bootloader (colo-chain.elf) first before attempting to"
diff --git a/sys-boot/colo/colo-1.4.ebuild b/sys-boot/colo/colo-1.4.ebuild
deleted file mode 100644
index 1712574421cb..000000000000
--- a/sys-boot/colo/colo-1.4.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.4.ebuild,v 1.3 2004/06/28 09:24:44 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/boot-loader/release-${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* mips"
-IUSE=""
-DEPEND=""
-FLASHTOOLVER="1.2"
-
-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 boot-loader Makefile(s)
-	S=${WORKDIR}/boot-loader-${PV}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-}
-
-src_compile() {
-	# boot-loader
-	echo -e ""
-	einfo "Building boot-loader-${PV} ..."
-	S=${WORKDIR}/boot-loader-${PV}
-	cd ${S}
-	make clean || die	# emake breaks the build
-	make || die
-
-	# flash-tool
-	echo -e ""
-	einfo "Building flash-tool-${FLASHTOOLVER} ..."
-	S=${WORKDIR}/flash-tool-${FLASHTOOLVER}
-	cd ${S}
-	rm -f flash-tool
-	make clean || die
-	make || die
-}
-
-src_install() {
-	# boot-loader bins
-	S=${WORKDIR}/boot-loader-${PV}
-	cd ${S}
-	dodir /usr/lib/colo
-	cp chain.bin ${D}/usr/lib/colo
-	cp boot.bin ${D}/usr/lib/colo
-	cp ${FILESDIR}/default.boot.example ${D}/usr/lib/colo
-
-	# boot-loader docs
-	dodoc COPYING INSTALL README README.{restore,shell} TODO
-
-	# flash-tool bins
-	S=${WORKDIR}/flash-tool-${FLASHTOOLVER}
-	cd ${S}
-	dosbin flash-tool
-}
-
-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.boot 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.boot.example to /boot/default.boot,"
-	einfo "otherwise the bootloader will attempt to automatically"
-	einfo "boot /boot/vmlinux.gz.  It is recommended that you edit"
-	einfo "the default.boot.example script to fit your needs and"
-	einfo "place it in /boot as default.boot."
-	echo -e ""
-	ewarn "Note: It is HIGHLY recommended that you use the chain"
-	ewarn "bootloader (chain.bin) 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.6.ebuild b/sys-boot/colo/colo-1.6.ebuild
deleted file mode 100644
index 9d3e47f1dab8..000000000000
--- a/sys-boot/colo/colo-1.6.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# 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.6.ebuild,v 1.3 2004/06/28 09:24:44 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}/${P}-gentoo.patch
-}
-
-src_compile() {
-	# boot-loader
-	cd ${S}
-	make clean || die	# emake breaks the build
-	make || die
-
-	# flash-tool
-	cd ${S}/tools/flash-tool
-	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
-}
-
-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.8.ebuild b/sys-boot/colo/colo-1.8.ebuild
deleted file mode 100644
index dbc2b81ba9f5..000000000000
--- a/sys-boot/colo/colo-1.8.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.8.ebuild,v 1.3 2004/06/28 09:24:44 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
-}
-
-# Not needed for this release, maybe others...
-#src_unpack() {
-#	unpack ${A}
-#
-#	# patch Docs
-#	cd ${S}
-#	epatch ${FILESDIR}/${P}-gentoo.patch
-#}
-
-src_compile() {
-	# boot-loader
-	cd ${S}
-	make clean || die	# emake breaks the build
-	make || die
-
-	# flash-tool
-	cd ${S}/tools/flash-tool
-	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
-}
-
-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
deleted file mode 100644
index f684ae2856a0..000000000000
--- a/sys-boot/colo/colo-1.9.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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.3 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
-}
-
-# Not needed for this release, maybe others...
-#src_unpack() {
-#	unpack ${A}
-#
-#	# patch Docs
-#	cd ${S}
-#	epatch ${FILESDIR}/${P}-gentoo.patch
-#}
-
-src_compile() {
-	# boot-loader
-	cd ${S}
-	make clean || die	# emake breaks the build
-	make || die
-
-	# flash-tool
-	cd ${S}/tools/flash-tool
-	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
-}
-
-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/files/colo-1.4-gentoo.patch b/sys-boot/colo/files/colo-1.4-gentoo.patch
deleted file mode 100644
index 2f07715d078a..000000000000
--- a/sys-boot/colo/files/colo-1.4-gentoo.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naurp boot-loader-1.4.orig/chain/Makefile boot-loader-1.4/chain/Makefile
---- boot-loader-1.4.orig/chain/Makefile	2004-03-28 16:48:37.000000000 -0500
-+++ boot-loader-1.4/chain/Makefile	2004-04-03 03:06:52.337184944 -0500
-@@ -12,7 +12,7 @@ OBJS=	chain.o\
- 		serial.o\
- 		start.o\
- 
--MIPSFLAGS= -mno-abicalls -fno-pic -EL -mips2 -mcpu=r5000
-+MIPSFLAGS= -mno-abicalls -fno-pic -G 0 -mips4 -mabi=32 -mtune=r5000
- 
- CFLAGS= -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-builtin -nostdlib $(MIPSFLAGS)
- ASFLAGS= $(MIPSFLAGS)
-diff -Naurp boot-loader-1.4.orig/chain/src/start.S boot-loader-1.4/chain/src/start.S
---- boot-loader-1.4.orig/chain/src/start.S	2004-03-28 16:25:38.000000000 -0500
-+++ boot-loader-1.4/chain/src/start.S	2004-04-03 03:37:01.898089872 -0500
-@@ -18,7 +18,7 @@
- 
- _start:			la	sp, __stack - 16
- 			lui	gp, %hi(_gp)
--			bal	chain
-+			jal	chain
- 			 addiu	gp, %lo(_gp)
- 
- 			b	.
-diff -Naurp boot-loader-1.4.orig/stage1/Makefile boot-loader-1.4/stage1/Makefile
---- boot-loader-1.4.orig/stage1/Makefile	2004-03-28 11:06:07.000000000 -0500
-+++ boot-loader-1.4/stage1/Makefile	2004-04-03 03:07:24.047364264 -0500
-@@ -15,7 +15,7 @@ OBJS=	init.o\
- 		fast.o\
- 		start.o\
- 
--MIPSFLAGS= -mno-abicalls -fno-pic -EL -mips2 -mcpu=r5000
-+MIPSFLAGS= -mno-abicalls -fno-pic -G 0 -mips4 -mabi=32 -mtune=r5000
- 
- CFLAGS= -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-builtin -nostdlib $(MIPSFLAGS)
- ASFLAGS= $(MIPSFLAGS)
-diff -Naurp boot-loader-1.4.orig/stage1/src/start.S boot-loader-1.4/stage1/src/start.S
---- boot-loader-1.4.orig/stage1/src/start.S	2004-03-28 11:06:07.000000000 -0500
-+++ boot-loader-1.4/stage1/src/start.S	2004-04-03 03:35:24.893836760 -0500
-@@ -16,16 +16,16 @@
- 
- 			la	sp, __stack - 16
- 			lui	gp, %hi(_gp)
--			bal	cpu_init
-+			jal	cpu_init
- 			 addiu	gp, %lo(_gp)
- 
--			bal	stage1
-+			jal	stage1
- 			 nop
- 
--			bal	loader
-+			jal	loader
- 			 subu	sp, v0, 16
- 
--			b	fatal
-+			j	fatal
- 			 nop
- 
- 			.org	0x200
-@@ -36,7 +36,7 @@
- 
- 1:			la	sp, __stack - 16
- 			lui	gp, %hi(_gp)
--			b	exception
-+			j	exception
- 			 addiu	gp, %lo(_gp)
- 
- 			.org	0x280
-diff -Naurp boot-loader-1.4.orig/stage2/Makefile boot-loader-1.4/stage2/Makefile
---- boot-loader-1.4.orig/stage2/Makefile	2004-03-28 14:30:52.000000000 -0500
-+++ boot-loader-1.4/stage2/Makefile	2004-04-03 03:07:39.687986528 -0500
-@@ -32,7 +32,7 @@ OBJS=	main.o\
- 		launch.o\
- 		start.o\
- 
--MIPSFLAGS= -mno-abicalls -fno-pic -EL -mips2 -mcpu=r5000
-+MIPSFLAGS= -mno-abicalls -fno-pic -G 0 -mips4 -mabi=32 -mtune=r5000
- 
- CFLAGS= -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-builtin -nostdlib $(MIPSFLAGS)
- ASFLAGS= $(MIPSFLAGS)
diff --git a/sys-boot/colo/files/colo-1.6-gentoo.patch b/sys-boot/colo/files/colo-1.6-gentoo.patch
deleted file mode 100644
index ee1df65e4809..000000000000
--- a/sys-boot/colo/files/colo-1.6-gentoo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- INSTALL.orig	2004-04-21 01:18:46.000000000 -0400
-+++ INSTALL	2004-04-21 01:20:09.000000000 -0400
-@@ -8,11 +8,11 @@ possible to use the original Cobalt boot
- loader - chain mode. This does away with the risk of trashing your unit,
- though it extends the time required to boot.
- 
--Just copy 'chain.bin' to your boot directory, rename into 'vmlinux' and gzip
-+Just copy 'colo-chain.elf' to your boot directory, rename into 'vmlinux' and gzip
- it to 'vmlinux.gz'
- 
- 	cp -f /boot/vmlinux.gz /boot/backup.gz
--	cp chain.bin /boot/vmlinux
-+	cp colo-chain.elf /boot/vmlinux
- 	gzip -9 /boot/vmlinux
- 	reboot
- 
-@@ -82,7 +82,7 @@ Step 4 - install the new boot loader
- Write the new boot loader into the Flash. Don't interrupt the programming
- process or you will probably land up with a unit that doesn't boot!
- 
--	flash-tool -w boot.bin
-+	flash-tool -w colo-rom-image.bin
- 
- If for any reason programming fails you might just be able to write the
- original boot loader back into the Flash
---- README.shell.orig	2004-04-21 01:23:51.000000000 -0400
-+++ README.shell	2004-04-21 01:24:02.000000000 -0400
-@@ -11,7 +11,7 @@ If no SPACE character is detected the bo
- using the default script :-
- 
- 	mount
--	-script /boot/default.boot
-+	-script /boot/default.colo
- 	load /boot/vmlinux.gz
- 	execute
- 
diff --git a/sys-boot/colo/files/default.boot.example b/sys-boot/colo/files/default.boot.example
deleted file mode 100644
index 4419cf0775fc..000000000000
--- a/sys-boot/colo/files/default.boot.example
+++ /dev/null
@@ -1,2 +0,0 @@
-mount
-ls
diff --git a/sys-boot/colo/files/default.colo b/sys-boot/colo/files/default.colo
new file mode 100644
index 000000000000..676a038388d1
--- /dev/null
+++ b/sys-boot/colo/files/default.colo
@@ -0,0 +1,25 @@
+#:CoLo:#
+
+# Turn on the serial port
+-serial on
+
+# Generate a menu to select the appropriate kernel image on the LCD Screen
+# Format is:
+# menu "<message>" <time out> <menu text 1> <menu option 1> <menu text 2> <menu option 2> ...
+# 
+# Where <menu text> is the item displayed, and <menu option> is the item
+# that the text corresponds to.  When a menu item is selected, the env variable
+# {menu-option} gets set to the value of <menu option>.
+#
+# Please note, no sample script has been provided for a backup script (linuxold).
+# You will need to create one yourself if you require this.
+menu "colo-@COLOVER@" 100 Linux linux Linux-OLD linuxold
+
+# Loads the corresponding script depending on the selected value from the menu
+-load /boot/menu-{menu-option}.colo
+-script
+
+# Incase of failure, return to the menu
+load /boot/default.colo
+script
+
diff --git a/sys-boot/colo/files/digest-colo-1.10 b/sys-boot/colo/files/digest-colo-1.10
deleted file mode 100644
index d7b975652691..000000000000
--- a/sys-boot/colo/files/digest-colo-1.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6e2ba1d2826fb51ce18cab3bc29aee91 colo-1.10.tar.gz 211446
diff --git a/sys-boot/colo/files/digest-colo-1.13 b/sys-boot/colo/files/digest-colo-1.13
new file mode 100644
index 000000000000..35fbf6d33823
--- /dev/null
+++ b/sys-boot/colo/files/digest-colo-1.13
@@ -0,0 +1 @@
+MD5 7ca79ea71d1d19b5699d5455752a6293 colo-1.13.tar.gz 225232
diff --git a/sys-boot/colo/files/digest-colo-1.4 b/sys-boot/colo/files/digest-colo-1.4
deleted file mode 100644
index e2f5d9426f82..000000000000
--- a/sys-boot/colo/files/digest-colo-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 51e908ca404b68e1346186c0de479c9d release-1.4.tar.gz 139761
diff --git a/sys-boot/colo/files/digest-colo-1.6 b/sys-boot/colo/files/digest-colo-1.6
deleted file mode 100644
index 4ff83e95e205..000000000000
--- a/sys-boot/colo/files/digest-colo-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 20cdca3fa4045b85869137425fed0577 colo-1.6.tar.gz 146206
diff --git a/sys-boot/colo/files/digest-colo-1.8 b/sys-boot/colo/files/digest-colo-1.8
deleted file mode 100644
index 74fc2ec7cf88..000000000000
--- a/sys-boot/colo/files/digest-colo-1.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db06ba7022c450b0e1508c65edbe8b0f colo-1.8.tar.gz 179843
diff --git a/sys-boot/colo/files/digest-colo-1.9 b/sys-boot/colo/files/digest-colo-1.9
deleted file mode 100644
index 3bd45e092fee..000000000000
--- a/sys-boot/colo/files/digest-colo-1.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b1394a8a4b981f00976d0e996cfb59e8 colo-1.9.tar.gz 192492
diff --git a/sys-boot/colo/files/menu-linux.colo b/sys-boot/colo/files/menu-linux.colo
new file mode 100644
index 000000000000..0c0156b4d65e
--- /dev/null
+++ b/sys-boot/colo/files/menu-linux.colo
@@ -0,0 +1,9 @@
+#:CoLo:#
+
+# Loads the kernel into memory (and unzips if needed)
+# Makes sure this points at the correct kernel image
+load /boot/vmlinuz.gz
+
+# Executes the loaded image with the specified command args
+# Change these args to suit your purposes
+execute root=/dev/hda5 console=ttyS0,115200