altboot: Update to 1.0.7 final

diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb
index 2782ad1..b604da1 100644 (file)
--- a/packages/altboot/altboot_0.0.0.bb
+++ b/packages/altboot/altboot_0.0.0.bb
@@ -21,7 +21,7 @@ RDEPENDS_${PN} = "${PN}-conf"
 
 ######################################################################################
 
-PR = "r43"
+PR = "r44"
 
 ######################################################################################
 

diff --git a/packages/altboot/altboot_1.0.6.bb b/packages/altboot/altboot_1.0.6.bb
deleted file mode 100644 (file)
index ee0fb7c..0000000
--- a/packages/altboot/altboot_1.0.6.bb
+++ /dev/null
@@ -1,92 +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 = "e2fsprogs-e2fsck dosfstools"
-RRECOMMENDS_append_akita = " kexec-tools"
-RRECOMMENDS_append_spitz = " kexec-tools"
-RRECOMMENDS_append_c7x0 = " kexec-tools"
-
-######################################################################################
-
-PR = "r1"
-
-######################################################################################
-
-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/altboot_1.0.7-rc4.bb b/packages/altboot/altboot_1.0.7-rc4.bb
deleted file mode 100644 (file)
index 245cf2a..0000000
--- a/packages/altboot/altboot_1.0.7-rc4.bb
+++ /dev/null
@@ -1,93 +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}"
-
-######################################################################################
-
-PR = "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};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 0755 ${WORKDIR}/altboot/init.altboot ${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
-}
-

diff --git a/packages/altboot/altboot_1.0.7.bb b/packages/altboot/altboot_1.0.7.bb
new file mode 100644 (file)
index 0000000..ee0fb7c
--- /dev/null
+++ b/packages/altboot/altboot_1.0.7.bb
@@ -0,0 +1,92 @@
+#! /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 = "e2fsprogs-e2fsck dosfstools"
+RRECOMMENDS_append_akita = " kexec-tools"
+RRECOMMENDS_append_spitz = " kexec-tools"
+RRECOMMENDS_append_c7x0 = " kexec-tools"
+
+######################################################################################
+
+PR = "r1"
+
+######################################################################################
+
+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/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 9a36b8e..87373d8 100644 (file)
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -25,7 +25,7 @@ run_module() {
        
        if test -z "$nfs_host"
        then
-               die "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
+               mdie "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
                
        fi
        
@@ -79,7 +79,7 @@ run_module() {
                selection="$nfs_mounts"
        fi
        
-       mkdir -p /media/nfsroot || die "mkdir -p /media/nfsroot failed!"
+       mkdir -p /media/nfsroot || mdie "mkdir -p /media/nfsroot failed!"
        
        echo -n "Mounting NFS root..."
        
@@ -91,7 +91,7 @@ run_module() {
                umount /media/nfsroot || die "umount failed!"
        fi
                
-       mount -t nfs "$selection" /media/nfsroot && echo ok || die "mount -t nfs "$selection" /media/nfsroot failed!"
+       mount -t nfs "$selection" /media/nfsroot && echo ok || mdie "mount -t nfs "$selection" /media/nfsroot failed!"
        
        # Use configured resolv.conf in the pivoted rootfs
        #echo -n "Copying resolv.conf..."

diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func
index 98c38b4..9a0b139 100644 (file)
--- a/packages/altboot/files/altboot.func
+++ b/packages/altboot/files/altboot.func
@@ -686,7 +686,7 @@ start_networking() {
                then
                        echo -e "\nRunning cardctl to setup networking..."
                        /etc/init.d/pcmcia start >/dev/null 2>&1 || die "/etc/init.d/pcmcia start failed!"
-                       sleep 1
+                       sleep 3
                else    
                        # With kernel 2.6.16+ udev is used 
                        echo -e "\nRunning udevd to setup networking..."
@@ -719,10 +719,25 @@ start_networking() {
 
        if test -z "$WLAN_NIC"
        then
-               debug_echo "WARNING: WLAN_NIC is empty!\n" 
-               debug_echo "Filter result: [$WLAN_NIC]"
-               debug_echo "iwconfig: [`iwconfig`]"
-               mdie "No network interface found"
+               # cardctl needs some time....
+               echo -n "Waiting for WLAN card.."
+               timeout=0
+               while test "$timeout" -lt 10
+               do
+                       WLAN_NIC="`iwconfig 2>/dev/null | grep ESSID | grep -v wifi | awk '{print $1}'`"
+                       test -n "$WLAN_NIC" && break                    
+                       echo -n "."
+                       let timeout=$timeout+1
+                       sleep 1
+               done    
+               
+               if test -z  "$WLAN_NIC"
+               then
+                       debug_echo "WARNING: WLAN_NIC is empty!\n" 
+                       debug_echo "Filter result: [$WLAN_NIC]"
+                       debug_echo "iwconfig: [`iwconfig`]"
+                       mdie "No network interface found"
+               fi                      
        fi
        
        # WLAN with DHCP needs some time to get a lease, set up the routing, etc.