[oe-commits] org.oe.dev altboot: Update to -wip-20061029
coredump commit
openembedded-commits at lists.openembedded.org
Sun Oct 29 12:21:07 UTC 2006
altboot: Update to -wip-20061029
- Added a work-around for the broken OUT_TTY assignment on Collie
Author: coredump at openembedded.org
Branch: org.openembedded.dev
Revision: acf428036dce8ef016092d5ebddb6e389c7f1f12
ViewMTN: http://monotone.openembedded.org/revision.psp?id=acf428036dce8ef016092d5ebddb6e389c7f1f12
Files:
1
packages/altboot/altboot_1.1.0-wip.bb
packages/altboot/altboot_0.0.0.bb
packages/altboot/files/init.altboot
Diffs:
#
# mt diff -r9f90e627a4c5aaa6f090746c5f35849e7b964033 -racf428036dce8ef016092d5ebddb6e389c7f1f12
#
#
#
# delete "packages/altboot/altboot_1.1.0-wip.bb"
#
# add_file "packages/altboot/altboot_1.1.0-wip.bb"
# content [a36c774dd407c7c740fe1f03e2dd95cd0c92f00e]
#
# patch "packages/altboot/altboot_0.0.0.bb"
# from [244c72e3711fec1c4a3e752210eccc27297e19e9]
# to [2f33cffb34a2dadaf9e08601d66e3e7ecbe9f9e5]
#
# patch "packages/altboot/files/init.altboot"
# from [49a643fa3acab1a8c6f5e04b4a25d7e9783177ef]
# to [a23050b1013cf1f2c704055cbb32f662c7143802]
#
============================================================
--- packages/altboot/altboot_1.1.0-wip.bb a36c774dd407c7c740fe1f03e2dd95cd0c92f00e
+++ packages/altboot/altboot_1.1.0-wip.bb a36c774dd407c7c740fe1f03e2dd95cd0c92f00e
@@ -0,0 +1,96 @@
+#! /bin/sh
+#
+# Copyright Matthias Hentges <devel at 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 at 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}"
+
+######################################################################################
+
+WIP_DATE = "20061029"
+PR = "${WIP_DATE}-r0"
+
+######################################################################################
+
+PACKAGES = "${PN}-conf ${PN}-doc ${PN}"
+
+PACKAGE_ARCH_${PN} = all
+PACKAGE_ARCH_${PN}-doc = all
+PACKAGE_ARCH_${PN}-conf = "${MACHINE}"
+
+TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
+
+SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG}-${WIP_DATE};module=altboot"
+
+S = "${WORKDIR}/altboot/"
+
+######################################################################################
+
+FILES_${PN}-conf = "/etc/altboot*.cfg"
+
+######################################################################################
+
+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 0644 ${WORKDIR}/altboot/altbootctl.conf ${D}/etc
+ install -m 0755 ${WORKDIR}/altboot/init.altboot ${D}/sbin
+ install -m 0755 ${WORKDIR}/altboot/altbootctl ${D}/sbin
+
+ install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu
+
+ install -m 0755 ${WORKDIR}/altboot/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced
+
+ 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_${PN}() {
+ update-alternatives --install /sbin/init init /sbin/init.altboot 55
+}
+
+######################################################################################
+
+pkg_postrm_${PN}() {
+ update-alternatives --remove init /sbin/init.altboot
+}
+
============================================================
--- packages/altboot/altboot_0.0.0.bb 244c72e3711fec1c4a3e752210eccc27297e19e9
+++ packages/altboot/altboot_0.0.0.bb 2f33cffb34a2dadaf9e08601d66e3e7ecbe9f9e5
@@ -20,7 +20,7 @@ RDEPENDS_${PN} = "${PN}-conf"
######################################################################################
-PR = "r46"
+PR = "r47"
######################################################################################
============================================================
--- packages/altboot/files/init.altboot 49a643fa3acab1a8c6f5e04b4a25d7e9783177ef
+++ packages/altboot/files/init.altboot a23050b1013cf1f2c704055cbb32f662c7143802
@@ -6,7 +6,7 @@ test -e /etc/altboot.func && . /etc/altb
#
test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
-
+
CURRENT_ENV="`set`"
VERSION="DEVELOPER SNAPSHOT"
@@ -17,8 +17,21 @@ test -z "$INIT_RUNLEVEL" && INIT_RUNLEVE
INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`"
test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5
+# If this step fails the results are fatal. Seen on Collie / kernel 2.4 (where else...)
OUT_TTY="`tty`" ; test -z "$OUT_TTY" && OUT_TTY="/dev/tty1"
+if test -z "$OUT_TTY"
+then
+ OUT_TTY="/dev/tty1"
+ echo "WARNING: Assgnment of OUT_TTY failed!" > "$OUT_TTY"
+fi
+
+if ( echo "$OUT_TTY" | grep -q "not" )
+then
+ OUT_TTY="/dev/tty1"
+ echo "WARNING: Assignment of OUT_TTY failed (2)!" > "$OUT_TTY"
+fi
+
case "`uname -r`" in
2.6*) ALTBOOT_CFG_FILE="/etc/altboot-2.6.cfg";;
2.4*) ALTBOOT_CFG_FILE="/etc/altboot-2.4.cfg";;
@@ -34,6 +47,8 @@ fi
rm "${ALTBOOT_CFG_FILE}.next-reboot"
fi
+test "$ENABLE_DEBUGGING" = "yes" && ENABLE_DEBUG="yes"
+
C_RED="\033[31m"
C_YELLOW="\033[33m"
C_BLUE="\033[34m"
@@ -167,9 +182,7 @@ show_sub_menu() {
#echo "[$d_entries]"
echo -e "\naltboot v$VERSION: $dirname menu\n"
-
- #debug_echo "show_sub_menu(): ping"
-
+
for d_entry in $d_entries
do
d_entry_number="`echo "$d_entry"| sed -n "s/\(.*\)\#\#\(.*\)\#\#\#/\1/p"`"
@@ -416,7 +429,7 @@ else
exec $REAL_INIT $INIT_RUNLEVEL
exit 0
fi
-
+
# Execute scripts in /etc/altboot.rc before doing anything else.
# Required in special situations, like booting spitz
RC_FILES=`ls /etc/altboot.rc | grep \.sh$`
More information about the Openembedded-commits
mailing list