From 57a694b5428496fb3a695c9464a233c417338f00 Mon Sep 17 00:00:00 2001
From: Matthias Hentges <oe@hentges.net>
Date: Tue, 3 Apr 2007 22:36:14 +0000
Subject: altboot: Add SVNR30 snapshot - Fix Neo1973 Menu options (except NFS)
 - Enable Neo1973 menu-navigation for /sbin/altboot - Add generic work-around
 for busybox ps - Fix /bin/sh boot on NSLU2 - Do no longer package emtpy
 "Advanced" directory

---
 packages/altboot/altboot_1.1.1+wip-SVNR28.bb | 123 --------------------------
 packages/altboot/altboot_1.1.1+wip-SVNR30.bb | 124 +++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 123 deletions(-)
 delete mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR28.bb
 create mode 100644 packages/altboot/altboot_1.1.1+wip-SVNR30.bb

diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR28.bb b/packages/altboot/altboot_1.1.1+wip-SVNR28.bb
deleted file mode 100644
index 4c14aef7b5..0000000000
--- a/packages/altboot/altboot_1.1.1+wip-SVNR28.bb
+++ /dev/null
@@ -1,123 +0,0 @@
-#! /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"
-LICENSE = "GPL" 
-
-######################################################################################
-
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_${PN}_append_akita = " kexec-tools"
-RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
-RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
-
-RDEPENDS_${PN} = "${PN}-conf"
-RDEPENDS_${PN}-conf = "${PN}"
-
-######################################################################################
-
-SVN_REV = "28"
-PR = "r1"
-
-######################################################################################
-
-PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
-
-PACKAGE_ARCH_${PN} = "${MACHINE}"
-PACKAGE_ARCH_${PN}-doc = "all"
-PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
-
-SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
-
-S = "${WORKDIR}/trunk/"
-
-######################################################################################
-
-FILES_${PN}-conf = "/etc/altboot*cfg"
-
-######################################################################################
-
-MACHINE_DIR = "${MACHINE}"
-MACHINE_DIR_nslu2be = "nslu2le"
-
-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 ${S}/${MACHINE_DIR}
-	then
-		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
-	else
-		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
-	fi
-
-	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
-	install -m 0644 ${S}/altboot.func ${D}/etc
-	install -m 0644 ${S}/altboot.sbin ${D}/etc
-	install -m 0644 ${S}/altbootctl.conf ${D}/etc
-	install -m 0755 ${S}/init.altboot ${D}/sbin
-	install -m 0755 ${S}/altbootctl ${D}/sbin
-	
-	ln -s /sbin/init.altboot ${D}/sbin/altboot
-
-	if test -d ${S}/${MACHINE_DIR}/altboot-menu
-	then
-		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
-		
-		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
-		then
-			install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-		fi
-	else
-		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
-
-		if test -d ${S}/altboot-menu/Advanced
-		then		
-			install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
-		fi
-	fi
-	
-	if test -d ${S}/${MACHINE_DIR}/altboot.rc
-	then
-		install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
-	else
-		install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
-		install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
-	fi
-}
-
-######################################################################################
-
-do_configure() {
-	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
-	mv ${S}/init.altboot_ ${S}/init.altboot
-}
-
-######################################################################################
-
-pkg_postinst_${PN}() {
-	test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
-	
-	update-alternatives --install /sbin/init init /sbin/init.altboot 55
-}
-
-######################################################################################
-
-pkg_postrm_${PN}() {
-	test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
-	
-	update-alternatives --remove init /sbin/init.altboot
-}
-
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR30.bb b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
new file mode 100644
index 0000000000..8b4a65a098
--- /dev/null
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR30.bb
@@ -0,0 +1,124 @@
+#! /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"
+LICENSE = "GPL" 
+
+######################################################################################
+
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_${PN}_append_akita = " kexec-tools"
+RRECOMMENDS_${PN}_append_spitz = " kexec-tools"
+RRECOMMENDS_${PN}_append_c7x0 = " kexec-tools"
+
+RDEPENDS_${PN} = "${PN}-conf"
+RDEPENDS_${PN}-conf = "${PN}"
+
+######################################################################################
+
+SVN_REV = "30"
+PR = "r1"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = "${MACHINE}"
+PACKAGE_ARCH_${PN}-doc = "all"
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+SRC_URI = "svn://hentges.net/altboot;module=trunk;rev=${SVN_REV}"
+
+S = "${WORKDIR}/trunk/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*cfg"
+
+######################################################################################
+
+MACHINE_DIR = "${MACHINE}"
+MACHINE_DIR_nslu2be = "nslu2le"
+
+do_install() {
+	install -d ${D}/sbin
+	install -d ${D}/etc/altboot-menu	
+	install -d ${D}/etc/altboot.rc
+	install -d ${D}/usr/share/doc/altboot
+	install -d ${D}/usr/share/sounds
+
+	if test -d ${S}/${MACHINE_DIR}
+	then
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot*.cfg ${D}/etc/
+	else
+		install -m 0644 ${S}/altboot*.cfg ${D}/etc/
+	fi
+
+	install -m 0644 ${S}/beep.raw ${D}/usr/share/sounds
+	install -m 0644 ${S}/altboot.func ${D}/etc
+	install -m 0644 ${S}/altboot.sbin ${D}/etc
+	install -m 0644 ${S}/altbootctl.conf ${D}/etc
+	install -m 0755 ${S}/init.altboot ${D}/sbin
+	install -m 0755 ${S}/altbootctl ${D}/sbin
+	
+	ln -s /sbin/init.altboot ${D}/sbin/altboot
+
+	if test -d ${S}/${MACHINE_DIR}/altboot-menu
+	then
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/*-* ${D}/etc/altboot-menu
+		
+		if test -d ${S}/${MACHINE_DIR}/altboot-menu/Advanced
+		then
+			install -d ${D}/etc/altboot-menu/Advanced
+			install -m 0755 ${S}/${MACHINE_DIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	else
+		install -m 0755 ${S}/altboot-menu/*-* ${D}/etc/altboot-menu
+
+		if test -d ${S}/altboot-menu/Advanced
+		then		
+			install -d ${D}/etc/altboot-menu/Advanced
+			install -m 0755 ${S}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+		fi
+	fi
+	
+	if test -d ${S}/${MACHINE_DIR}/altboot.rc
+	then
+		install -m 0755 ${S}/${MACHINE_DIR}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/${MACHINE_DIR}/altboot.rc/*.txt ${D}/etc/altboot.rc	
+	else
+		install -m 0755 ${S}/altboot.rc/*.sh ${D}/etc/altboot.rc
+		install -m 0644 ${S}/altboot.rc/*.txt ${D}/etc/altboot.rc
+	fi
+}
+
+######################################################################################
+
+do_configure() {
+	cat ${S}/init.altboot | sed "s/^VERSION=.*/VERSION=\"${PV}-${PR}\"/" > ${S}/init.altboot_
+	mv ${S}/init.altboot_ ${S}/init.altboot
+}
+
+######################################################################################
+
+pkg_postinst_${PN}() {
+	test -L /linuxrc && update-alternatives --install /linuxrc linuxrc /sbin/init.altboot 55
+	
+	update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+######################################################################################
+
+pkg_postrm_${PN}() {
+	test -L /linuxrc && update_alternatives --remove linuxrc /sbin/init.altboot
+	
+	update-alternatives --remove init /sbin/init.altboot
+}
+
-- 
cgit v1.2.3