altboot: mv 1.0.6-rc4 1.0.6, added 1.0.7-rc1 with kexec support and changes all over the place.

5 files changed, 89 insertions, 2 deletions

diff --git a/packages/altboot/altboot_1.0.6-rc4.bb b/packages/altboot/altboot_1.0.6.bb
index c13b346fc3..c13b346fc3 100644
--- a/packages/altboot/altboot_1.0.6-rc4.bb
+++ b/packages/altboot/altboot_1.0.6.bb
diff --git a/packages/altboot/altboot_1.0.7-rc1.bb b/packages/altboot/altboot_1.0.7-rc1.bb
new file mode 100644
index 0000000000..c13b346fc3
--- /dev/null
+++ b/packages/altboot/altboot_1.0.7-rc1.bb
@@ -0,0 +1,84 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
+# License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license)
+#
+# Filename: altboot_1.0.5-rc2.bb
+# Date: 21-Feb-06
+
+DESCRIPTION = "The altboot bootmanager"
+MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
+HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
+
+######################################################################################
+
+PR = "r0"
+
+######################################################################################
+
+PACKAGE_ARCH = "${MACHINE}"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
+
+SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot"
+
+S = "${WORKDIR}/altboot/"
+
+######################################################################################
+
+do_install() {
+	install -d ${D}/sbin
+	install -d ${D}/etc/altboot-menu
+	install -d ${D}/etc/altboot-menu/Advanced
+	install -d ${D}/etc/altboot.rc
+	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
+	
+	if test -d ${WORKDIR}/altboot/${MACHINE}
+	then
+		install -m 0644 ${WORKDIR}/altboot/${MACHINE}/altboot*.cfg ${D}/etc
+	else
+		install -m 0644 ${WORKDIR}/altboot/altboot*.cfg ${D}/etc
+	fi
+
+	install -m 0644 ${WORKDIR}/altboot/beep.raw ${D}/usr/share/sounds
+	install -m 0644 ${WORKDIR}/altboot/altboot.func ${D}/etc
+	install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
+	
+	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/	
+	then
+		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/*-* ${D}/etc/altboot-menu
+	else
+		install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
+	fi
+
+	if test -d ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/
+	then
+		install -m 0755 ${WORKDIR}/altboot/${MACHINE}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+	else
+		install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+	fi
+	
+	install -m 0755 ${WORKDIR}/altboot/altboot.rc/*.sh ${D}/etc/altboot.rc
+	install -m 0644 ${WORKDIR}/altboot/altboot.rc/*.txt ${D}/etc/altboot.rc	
+}		
+
+######################################################################################
+
+do_configure() {
+	cat ${WORKDIR}/altboot/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}\"/" > ${WORKDIR}/altboot/init.altboot_
+	mv ${WORKDIR}/altboot/init.altboot_ ${WORKDIR}/altboot/init.altboot
+}
+
+######################################################################################
+
+pkg_postinst() {
+	update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+######################################################################################
+
+pkg_postrm() {
+	update-alternatives --remove init /sbin/init.altboot
+}
+
diff --git a/packages/altboot/files/altboot-menu/Advanced/70-setKernel b/packages/altboot/files/altboot-menu/Advanced/70-setKernel
index 3479637ba1..a2c1efa81b 100644
--- a/packages/altboot/files/altboot-menu/Advanced/70-setKernel
+++ b/packages/altboot/files/altboot-menu/Advanced/70-setKernel
@@ -11,7 +11,7 @@ run_module() {
 	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
 	
 	test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot"	
-	test -x "$KEXEC_BIN" || die "kexec-tools not found [$KEXEC_BIN]"
+	test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]"
 	
 	# Mount /proc, etc
 	# init_rootfs
diff --git a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
index 9418e30dcf..27b6a871a6 100644
--- a/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
+++ b/packages/altboot/files/altboot-menu/Advanced/80-configure-kexec
@@ -11,7 +11,7 @@ run_module() {
 	test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
 	
 	test -z "$KEXEC_KERNEL_DIR" && KEXEC_KERNEL_DIR="/boot"	
-	test -x "$KEXEC_BIN" || die "kexec-tools not found [$KEXEC_BIN]"
+	test -x "$KEXEC_BIN" || mdie "kexec-tools not found [$KEXEC_BIN]"
 	
 	# Mount /proc, etc
 	init_rootfs
diff --git a/packages/altboot/files/c7x0/altboot-2.6.cfg b/packages/altboot/files/c7x0/altboot-2.6.cfg
index 71dd5099c2..c077659d0b 100644
--- a/packages/altboot/files/c7x0/altboot-2.6.cfg
+++ b/packages/altboot/files/c7x0/altboot-2.6.cfg
@@ -21,6 +21,9 @@ USB_NETWORKING_AVAILABLE="yes"
 USB_NW_MODULES="usbcore pxa27x_udc ohci-hcd g_ether"
 USB_NW_DEVICE="usb0"
 
+KEXEC_KERNEL_DIR="/boot"
+KEXEC_BIN="/usr/sbin/kexec"
+
 INIT_RUNLEVEL="5"
 NO_GUI_RL="2"
 MASTER_PASSWORD=""