From e387bcc059111a78686b097c711d28527defe510 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Tue, 21 Feb 2006 12:46:50 +0000 Subject: altboot: mv altboot.bb altboot_0.0.0.bb --- packages/altboot/altboot.bb | 98 ---------------------------- packages/altboot/altboot_0.0.0.bb | 98 ++++++++++++++++++++++++++++ packages/altboot/altboot_0.0.5-rc2.bb | 4 +- packages/altboot/files/akita/altboot-2.6.cfg | 3 + 4 files changed, 102 insertions(+), 101 deletions(-) delete mode 100644 packages/altboot/altboot.bb create mode 100644 packages/altboot/altboot_0.0.0.bb diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb deleted file mode 100644 index ce586f6f4b..0000000000 --- a/packages/altboot/altboot.bb +++ /dev/null @@ -1,98 +0,0 @@ -DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD, CF, USB-Storage and NFS. \ -Tested machines: Collie, Poodle, Akita, Spitz" -SECTION = "base" -PRIORITY = "optional" -MAINTAINER = "Matthias 'CoreDump' Hentges " -LICENSE = "GPL" -IGNORE_STRIP_ERRORS = "1" - -PR = "r20" - - -SRC_URI = "file://altboot-menu \ - file://altboot.rc \ - file://altboot.func \ - file://init.altboot \ - file://altboot*.cfg" - -# S = "${WORKDIR}/files" - -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 -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc - install -m 0644 ${WORKDIR}/altboot.func ${D}/etc -# install -m 0644 ${WORKDIR}/docs/altboot/*.txt ${D}/usr/share/doc/altboot - install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin - install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu - install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced - install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc - install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc -} - - - -pkg_postinst() { - update-alternatives --install /sbin/init init /sbin/init.altboot 55 -} - -pkg_postinst_spitz() { - # Note: Spitz support is a royal pain in the ass. - # Since Spitz pivot_roots by default, there is no real way - # a user can install an altboot.ipk into the flash FS. - # So we need to do that manually (*SIGH*) - - # /l/m only exists on the HDD on spitz - if test -d /lib/modules - then - if [ -e /media/realroot/sbin/init ]; then - ROOT_MOUNT_POINT="/media/realroot" - elif [ -e /media/ROM/sbin/init ]; then - ROOT_MOUNT_POINT="/media/ROM" - fi - if [ ! "$ROOT_MOUNT_POINT" = "" ]; then - ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` - if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then - mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT - cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc - cp /sbin/init.altboot $ROOT_MOUNT_POINT/sbin - if [ -f $ROOT_MOUNT_POINT/sbin/init ]; then - mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig - fi - ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init - fi - fi - fi -} - -pkg_postrm() { - update-alternatives --remove init /sbin/init.altboot -} - -pkg_postrm_spitz() { - if test -d /lib/modules - then - if [ -e /media/realroot/sbin/init ]; then - ROOT_MOUNT_POINT="/media/realroot" - elif [ -e /media/ROM/sbin/init ]; then - ROOT_MOUNT_POINT="/media/ROM" - fi - if [ ! "$ROOT_MOUNT_POINT" = "" ]; then - ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` - if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then - mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT - if [ -f $ROOT_MOUNT_POINT/sbin/init.orig ]; then - rm $ROOT_MOUNT_POINT/sbin/init - rm $ROOT_MOUNT_POINT/sbin/init.altboot - mv $ROOT_MOUNT_POINT/sbin/init.orig $ROOT_MOUNT_POINT/sbin/init - else - echo "$ROOT_MOUNT_POINT/sbin/init.orig not found, not uninstalling altboot!" - fi - fi - fi - fi -} diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb new file mode 100644 index 0000000000..54d260a76a --- /dev/null +++ b/packages/altboot/altboot_0.0.0.bb @@ -0,0 +1,98 @@ +DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD, CF, USB-Storage and NFS. \ +Tested machines: Collie, Poodle, Akita, Spitz" +SECTION = "base" +PRIORITY = "optional" +MAINTAINER = "Matthias 'CoreDump' Hentges " +LICENSE = "GPL" +IGNORE_STRIP_ERRORS = "1" + +PR = "r21" + + +SRC_URI = "file://altboot-menu \ + file://altboot.rc \ + file://altboot.func \ + file://init.altboot \ + file://altboot*.cfg" + +# S = "${WORKDIR}/files" + +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 -m 0644 ${WORKDIR}/altboot*.cfg ${D}/etc + install -m 0644 ${WORKDIR}/altboot.func ${D}/etc +# install -m 0644 ${WORKDIR}/docs/altboot/*.txt ${D}/usr/share/doc/altboot + install -m 0755 ${WORKDIR}/init.altboot ${D}/sbin + install -m 0755 ${WORKDIR}/altboot-menu/*-* ${D}/etc/altboot-menu + install -m 0755 ${WORKDIR}/altboot-menu/Advanced/*-* ${D}/etc/altboot-menu/Advanced + install -m 0755 ${WORKDIR}/altboot.rc/*.sh ${D}/etc/altboot.rc + install -m 0644 ${WORKDIR}/altboot.rc/*.txt ${D}/etc/altboot.rc +} + + + +pkg_postinst() { + update-alternatives --install /sbin/init init /sbin/init.altboot 55 +} + +pkg_postinst_spitz() { + # Note: Spitz support is a royal pain in the ass. + # Since Spitz pivot_roots by default, there is no real way + # a user can install an altboot.ipk into the flash FS. + # So we need to do that manually (*SIGH*) + + # /l/m only exists on the HDD on spitz + if test -d /lib/modules + then + if [ -e /media/realroot/sbin/init ]; then + ROOT_MOUNT_POINT="/media/realroot" + elif [ -e /media/ROM/sbin/init ]; then + ROOT_MOUNT_POINT="/media/ROM" + fi + if [ ! "$ROOT_MOUNT_POINT" = "" ]; then + ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` + if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then + mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT + cp -R /etc/altboot* $ROOT_MOUNT_POINT/etc + cp /sbin/init.altboot $ROOT_MOUNT_POINT/sbin + if [ -f $ROOT_MOUNT_POINT/sbin/init ]; then + mv $ROOT_MOUNT_POINT/sbin/init $ROOT_MOUNT_POINT/sbin/init.orig + fi + ln -s /sbin/init.altboot $ROOT_MOUNT_POINT/sbin/init + fi + fi + fi +} + +pkg_postrm() { + update-alternatives --remove init /sbin/init.altboot +} + +pkg_postrm_spitz() { + if test -d /lib/modules + then + if [ -e /media/realroot/sbin/init ]; then + ROOT_MOUNT_POINT="/media/realroot" + elif [ -e /media/ROM/sbin/init ]; then + ROOT_MOUNT_POINT="/media/ROM" + fi + if [ ! "$ROOT_MOUNT_POINT" = "" ]; then + ROOT_MOUNT_DEVICE=`cat /proc/mounts | grep $ROOT_MOUNT_POINT | grep jffs2 | cut -d " " -f 1` + if [ ! "$ROOT_MOUNT_DEVICE" = "" ]; then + mount -oremount,rw $ROOT_MOUNT_DEVICE $ROOT_MOUNT_POINT + if [ -f $ROOT_MOUNT_POINT/sbin/init.orig ]; then + rm $ROOT_MOUNT_POINT/sbin/init + rm $ROOT_MOUNT_POINT/sbin/init.altboot + mv $ROOT_MOUNT_POINT/sbin/init.orig $ROOT_MOUNT_POINT/sbin/init + else + echo "$ROOT_MOUNT_POINT/sbin/init.orig not found, not uninstalling altboot!" + fi + fi + fi + fi +} diff --git a/packages/altboot/altboot_0.0.5-rc2.bb b/packages/altboot/altboot_0.0.5-rc2.bb index ddf53ec591..e4e20b5abe 100644 --- a/packages/altboot/altboot_0.0.5-rc2.bb +++ b/packages/altboot/altboot_0.0.5-rc2.bb @@ -3,7 +3,7 @@ # Copyright Matthias Hentges (c) 2006 # License: GPL (see http://www.gnu.org/licenses/gpl.txt for a copy of the license) # -# Filename: Untitled +# Filename: altboot_0.0.5-rc2.bb # Date: 21-Feb-06 DESCRIPTION = "The altboot bootmanager" @@ -20,8 +20,6 @@ TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}" SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;method=pserver;tag=${TAG};module=altboot" -S = "${PN}" - ###################################################################################### do_install() { diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg index 42f0968134..69f7c8351b 100644 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ b/packages/altboot/files/akita/altboot-2.6.cfg @@ -18,6 +18,9 @@ USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" +KEXEC_KERNEL_DIR="/boot" +KEXEC_BIN="/usr/sbin/kexec" + INIT_RUNLEVEL="5" NO_GUI_RL="2" MASTER_PASSWORD="" -- cgit v1.2.3