Dump ancient 1.13 release. Promote 1.19 to stable. Removed some stale patches. Created new .colo example files.

(Portage version: 2.0.51.22-r3)

8 files changed, 98 insertions, 75 deletions

diff --git a/sys-boot/colo/ChangeLog b/sys-boot/colo/ChangeLog
index 095e046a9d50..dc448096932b 100644
--- a/sys-boot/colo/ChangeLog
+++ b/sys-boot/colo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-boot/colo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.14 2005/07/09 10:49:57 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/ChangeLog,v 1.15 2005/12/07 07:33:43 redhatter Exp $
+
+  07 Dec 2005; Stuart Longland <redhatter@gentoo.org>
+  -files/colo-linker-overlap-fix.patch, +files/menu.colo,
+  +files/simple.colo, colo-1.16.ebuild, colo-1.19.ebuild:
+  Dump ancient 1.13 release. Promote 1.19 to stable. Removed some stale
+  patches. Created new .colo example files.
 
   09 Jul 2005; Stuart Longland <redhatter@gentoo.org> colo-1.16.ebuild:
   No bugs filed in over a month.  Moving colo-1.16 to stable (mips)
diff --git a/sys-boot/colo/Manifest b/sys-boot/colo/Manifest
index fe3ccf1d0f6e..95dba34b3d7e 100644
--- a/sys-boot/colo/Manifest
+++ b/sys-boot/colo/Manifest
@@ -1,11 +1,8 @@
-MD5 b4b40f8fa2c83fedc1252c16ce931d9b colo-1.13.ebuild 3754
-MD5 b319962f83cf861d5eaf4317eda767fd colo-1.16.ebuild 4460
-MD5 821bbe104fd36eab5f08495277bc5adb metadata.xml 364
-MD5 2b85134e7f9eb9f7882bcfdad530cfd0 colo-1.19.ebuild 3744
 MD5 cf3267eb9bf69e9d7ba3e030629b4fb7 ChangeLog 2494
-MD5 bcfba587298a2f1a3dd4c186dbc1ce0d files/colo-linker-overlap-fix.patch 1489
-MD5 887b7cc9e154a546edceffc8ecedc9fd files/default.colo 840
-MD5 3a2004f193ec415c0087691d913c92db files/digest-colo-1.13 61
+MD5 9e22093cdf8afca8a5c4f770093e03ce colo-1.16.ebuild 4197
+MD5 3c237a4bc2195f3859e5c757a2199a95 colo-1.19.ebuild 3480
+MD5 821bbe104fd36eab5f08495277bc5adb metadata.xml 364
 MD5 90a0baf918f815c9b6d3daafcc77c960 files/digest-colo-1.16 61
-MD5 216fc6b6d9c407532a57bf484d8fe7d3 files/menu-linux.colo 286
 MD5 b2c42788147b311d818a159f61096aff files/digest-colo-1.19 61
+MD5 82b6d9369a375d8265b561e2a6938ad9 files/simple.colo 552
+MD5 2bd3f0b27a4cb1b7caf06d5e86065715 files/menu.colo 1530
diff --git a/sys-boot/colo/colo-1.16.ebuild b/sys-boot/colo/colo-1.16.ebuild
index ec62bad03ba3..37f2bb347a65 100644
--- a/sys-boot/colo/colo-1.16.ebuild
+++ b/sys-boot/colo/colo-1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.16.ebuild,v 1.2 2005/07/09 10:49:57 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.16.ebuild,v 1.3 2005/12/07 07:33:43 redhatter Exp $
 
 inherit eutils
 
@@ -29,12 +29,6 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-
-	# cp the bootscripts to WORKDIR
-	cp ${FILESDIR}/menu-linux.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() {
@@ -115,7 +109,7 @@ src_install() {
 
 	# bootscripts
 	dodir /usr/lib/colo/scripts
-	cp ${WORKDIR}/default.colo ${WORKDIR}/menu-linux.colo ${D}/usr/lib/colo/scripts
+	cp ${FILESDIR}/*.colo ${D}/usr/lib/colo/scripts
 }
 
 pkg_postinst() {
diff --git a/sys-boot/colo/colo-1.19.ebuild b/sys-boot/colo/colo-1.19.ebuild
index 10e9a77f8af0..b6e9f69e488e 100644
--- a/sys-boot/colo/colo-1.19.ebuild
+++ b/sys-boot/colo/colo-1.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.19.ebuild,v 1.1 2005/06/04 07:29:44 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/colo-1.19.ebuild,v 1.2 2005/12/07 07:33:43 redhatter 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"
@@ -29,12 +29,6 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-
-	# cp the bootscripts to WORKDIR
-	cp ${FILESDIR}/menu-linux.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() {
@@ -78,7 +72,7 @@ src_install() {
 
 	# bootscripts
 	dodir /usr/lib/colo/scripts
-	cp ${WORKDIR}/default.colo ${WORKDIR}/menu-linux.colo ${D}/usr/lib/colo/scripts
+	cp ${FILESDIR}/*.colo ${D}/usr/lib/colo/scripts
 }
 
 pkg_postinst() {
diff --git a/sys-boot/colo/files/colo-linker-overlap-fix.patch b/sys-boot/colo/files/colo-linker-overlap-fix.patch
deleted file mode 100644
index a839da19a88e..000000000000
--- a/sys-boot/colo/files/colo-linker-overlap-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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.13 b/sys-boot/colo/files/digest-colo-1.13
deleted file mode 100644
index 35fbf6d33823..000000000000
--- a/sys-boot/colo/files/digest-colo-1.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7ca79ea71d1d19b5699d5455752a6293 colo-1.13.tar.gz 225232
diff --git a/sys-boot/colo/files/menu.colo b/sys-boot/colo/files/menu.colo
new file mode 100644
index 000000000000..014cd25f73c2
--- /dev/null
+++ b/sys-boot/colo/files/menu.colo
@@ -0,0 +1,61 @@
+#:CoLo:#
+# Example configuration file for CoLo, version 1.16 or above.
+# 
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/files/menu.colo,v 1.1 2005/12/07 07:33:43 redhatter Exp $
+
+# Turn on the serial port; if possible.  - means to ignore the error and keep
+# going.  Without this, execution would halt here if this command failed (e.g.
+# on Qube 2700; which lacks serial ports)
+-serial on
+
+# Mount the hard drive
+lcd "Mounting hda1"
+mount hda1
+
+# Ask the user... which kernel?
+# Timeout; 50/10 seconds
+#
+# The format is:
+#   select "Message Goes Here" TimeOut label1 [label2 ... [labelN]]
+#
+# This will set the {menu-option} variable to the entry corresponding to the
+# selected value, or 0 if no option is selected.
+select "Which Kernel?" 50 Working New
+
+# Now... jump to the line corresponding to the selection...
+#
+# Explaination of the goto command...
+#   goto [-]numMarks -- prefixing with - means jump backwards
+# or
+#   goto numMarks{b|f} -- b == jump back, f == jump forward
+# 
+# Marks are indicated by a line starting with a @ symbol.
+# 
+# We use this jump to set the {image-name} variable to a kernel image.
+#
+# Explaination of the var command:
+#   var VariableName Value
+#
+
+goto {menu-option}
+
+# {menu-option} = 0; TimeOut or Cancel
+var image-name vmlinux.gz.working
+
+# Skip to the next two @ lines, start at the third @ line.
+goto 3f
+
+# {menu-option} = 1; "Working" selected.
+@var image-name vmlinux.gz.working
+
+goto 2f
+@var image-name vmlinux.gz.new
+
+# Load the requested image
+@lcd "Loading Linux" {image-name}
+load /{image-name}
+
+# Boot
+lcd "Booting..."
+execute root=/dev/hda5 ro console=ttyS0,115200
+boot
diff --git a/sys-boot/colo/files/simple.colo b/sys-boot/colo/files/simple.colo
new file mode 100644
index 000000000000..0664abc37fa0
--- /dev/null
+++ b/sys-boot/colo/files/simple.colo
@@ -0,0 +1,20 @@
+#:CoLo:#
+#
+# Simple CoLo boot script.
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/colo/files/simple.colo,v 1.1 2005/12/07 07:33:43 redhatter Exp $
+
+# Turn serial on; if possible
+# - means: "ignore any failure", so if the machine has no serial device (such as
+# a Qube 2700), it will simply pretend the command never happened.
+-serial on
+
+# Mount the hard drive
+mount hda1
+
+# Loads the kernel into memory (and unzips if needed)
+# Makes sure this points at the correct kernel image
+load /boot/kernel.gz
+
+# Executes the loaded image with the specified command args
+# Change these args to suit your purposes
+execute root=/dev/hda5 console=ttyS0,115200