From 1eb8f416a72dd98faea8018e4934bb4420a6ae99 Mon Sep 17 00:00:00 2001 From: Matthias Hentges Date: Mon, 30 Jan 2006 12:35:47 +0000 Subject: altboot: More 2.6 changes - Use altboot-KERNEL_VERSION.cfg instead of altboot.cfg --- packages/altboot/altboot.bb | 6 ++--- packages/altboot/files/akita/altboot-2.4.cfg | 26 ++++++++++++++++++++ packages/altboot/files/akita/altboot.cfg | 26 -------------------- packages/altboot/files/collie/altboot-2.4.cfg | 20 +++++++++++++++ packages/altboot/files/collie/altboot.cfg | 20 --------------- packages/altboot/files/init.altboot | 6 ++++- packages/altboot/files/poodle/altboot-2.4.cfg | 20 +++++++++++++++ packages/altboot/files/poodle/altboot.cfg | 20 --------------- packages/altboot/files/spitz/altboot-2.4.cfg | 35 +++++++++++++++++++++++++++ packages/altboot/files/spitz/altboot.cfg | 35 --------------------------- 10 files changed, 109 insertions(+), 105 deletions(-) create mode 100644 packages/altboot/files/akita/altboot-2.4.cfg delete mode 100644 packages/altboot/files/akita/altboot.cfg create mode 100644 packages/altboot/files/collie/altboot-2.4.cfg delete mode 100644 packages/altboot/files/collie/altboot.cfg create mode 100644 packages/altboot/files/poodle/altboot-2.4.cfg delete mode 100644 packages/altboot/files/poodle/altboot.cfg create mode 100644 packages/altboot/files/spitz/altboot-2.4.cfg delete mode 100644 packages/altboot/files/spitz/altboot.cfg diff --git a/packages/altboot/altboot.bb b/packages/altboot/altboot.bb index 786d45ef5d..46a95ac5d6 100644 --- a/packages/altboot/altboot.bb +++ b/packages/altboot/altboot.bb @@ -6,14 +6,14 @@ MAINTAINER = "Matthias 'CoreDump' Hentges " LICENSE = "GPL" IGNORE_STRIP_ERRORS = "1" -PR = "r14" +PR = "r15" SRC_URI = "file://altboot-menu \ file://altboot.rc \ file://altboot.func \ file://init.altboot \ - file://altboot.cfg" + file://altboot*.cfg" # S = "${WORKDIR}/files" @@ -24,7 +24,7 @@ do_install() { 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*.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 diff --git a/packages/altboot/files/akita/altboot-2.4.cfg b/packages/altboot/files/akita/altboot-2.4.cfg new file mode 100644 index 0000000000..9175cb1b06 --- /dev/null +++ b/packages/altboot/files/akita/altboot-2.4.cfg @@ -0,0 +1,26 @@ +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" +TIMEOUT="4" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="yes" + +SD_DEVICE="/dev/mmcda1" +SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" + +USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/akita/altboot.cfg b/packages/altboot/files/akita/altboot.cfg deleted file mode 100644 index 9175cb1b06..0000000000 --- a/packages/altboot/files/akita/altboot.cfg +++ /dev/null @@ -1,26 +0,0 @@ -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="4" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/collie/altboot-2.4.cfg b/packages/altboot/files/collie/altboot-2.4.cfg new file mode 100644 index 0000000000..9d2560f76b --- /dev/null +++ b/packages/altboot/files/collie/altboot-2.4.cfg @@ -0,0 +1,20 @@ +# +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" +TIMEOUT="3" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="no" +SD_DEVICE="/dev/mmcda1" +SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg deleted file mode 100644 index 9d2560f76b..0000000000 --- a/packages/altboot/files/collie/altboot.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="no" -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot index 506f175c69..2de4ba247c 100644 --- a/packages/altboot/files/init.altboot +++ b/packages/altboot/files/init.altboot @@ -17,7 +17,11 @@ REAL_INIT="/sbin/init.sysvinit" INIT_RUNLEVEL="`cat /etc/inittab | sed -n "/^id\:/s/id\:\([0-9]\)\:.*$/\1/p"`" test -z "$INIT_RUNLEVEL" && INIT_RUNLEVEL=5 -test -e /etc/altboot.cfg && . /etc/altboot.cfg || echo "WARNING: No altboot.cfg found! Check your installation of Altboot!" > /dev/tty1 +case "`uname -r`" in +2.6*) test -e /etc/altboot-2.6.cfg && . /etc/altboot-2.6.cfg || echo "WARNING: No altboot-2.6.cfg found! Check your installation of Altboot!" > /dev/tty1;; +2.4*) test -e /etc/altboot-2.4.cfg && . /etc/altboot-2.4.cfg || echo "WARNING: No altboot-2.4.cfg found! Check your installation of Altboot!" > /dev/tty1;; +*) die "Unknown kernel [uname -r], no configuration found.";; +esac C_RED="\033[31m" C_BLUE="\033[34m" diff --git a/packages/altboot/files/poodle/altboot-2.4.cfg b/packages/altboot/files/poodle/altboot-2.4.cfg new file mode 100644 index 0000000000..9d2560f76b --- /dev/null +++ b/packages/altboot/files/poodle/altboot-2.4.cfg @@ -0,0 +1,20 @@ +# +# Handled by /sbin/init.altboot +# Allow booting images from SD or CF instead of booting +# the ROM. +ENABLE_ALTBOOT="yes" +TIMEOUT="3" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext2" +FSCK_IMAGES="no" +SD_DEVICE="/dev/mmcda1" +SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/poodle/altboot.cfg b/packages/altboot/files/poodle/altboot.cfg deleted file mode 100644 index 9d2560f76b..0000000000 --- a/packages/altboot/files/poodle/altboot.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# -# Handled by /sbin/init.altboot -# Allow booting images from SD or CF instead of booting -# the ROM. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext2" -FSCK_IMAGES="no" -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/lib/modules/2.4.18-rmk7-pxa3-embedix/kernel/drivers/block/sharp_mmcsd_m.o" -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" diff --git a/packages/altboot/files/spitz/altboot-2.4.cfg b/packages/altboot/files/spitz/altboot-2.4.cfg new file mode 100644 index 0000000000..7a161b7a9c --- /dev/null +++ b/packages/altboot/files/spitz/altboot-2.4.cfg @@ -0,0 +1,35 @@ +# +# Handled by /sbin/init.altboot +# Allow booting images from SD, CF or RAM instead of booting +# the ROM. This is currently broken. +ENABLE_ALTBOOT="yes" +TIMEOUT="3" +REAL_INIT="/sbin/init.sysvinit" +SH_SHELL="/bin/sh" + +IMAGE_PATH="boot-images" +IMAGE_TYPE="ext3" +FSCK_IMAGES="yes" + +SD_DEVICE="/dev/mmcda1" +SD_KERNEL_MODULE="/media/hdd/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" + +USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" +USB_STORAGE_PARTITION="/dev/sda1" +USB_STORAGE_WAIT="4" + +INIT_RUNLEVEL="5" +NO_GUI_RL="2" +MASTER_PASSWORD="" +ASK_PW_ON_BOOT="no" + +SD_MOUNTPOINT="/media/card" +CF_MOUNTPOINT="/media/cf" + +HDD3_DEVICE="/dev/hda3" +HDD3_MOUNTPOINT="/media/hdd3" +HDD3_TYPE="vfat" + +SPITZ_HDD_PART="/dev/hda1" +SPITZ_HDD_TYPE="ext3" + diff --git a/packages/altboot/files/spitz/altboot.cfg b/packages/altboot/files/spitz/altboot.cfg deleted file mode 100644 index 7a161b7a9c..0000000000 --- a/packages/altboot/files/spitz/altboot.cfg +++ /dev/null @@ -1,35 +0,0 @@ -# -# Handled by /sbin/init.altboot -# Allow booting images from SD, CF or RAM instead of booting -# the ROM. This is currently broken. -ENABLE_ALTBOOT="yes" -TIMEOUT="3" -REAL_INIT="/sbin/init.sysvinit" -SH_SHELL="/bin/sh" - -IMAGE_PATH="boot-images" -IMAGE_TYPE="ext3" -FSCK_IMAGES="yes" - -SD_DEVICE="/dev/mmcda1" -SD_KERNEL_MODULE="/media/hdd/lib/modules/2.4.20/kernel/drivers/block/sharp_mmcsd_m.o" - -USB_STORAGE_MODULES="usb_ohci_pxa27x usb-storage" -USB_STORAGE_PARTITION="/dev/sda1" -USB_STORAGE_WAIT="4" - -INIT_RUNLEVEL="5" -NO_GUI_RL="2" -MASTER_PASSWORD="" -ASK_PW_ON_BOOT="no" - -SD_MOUNTPOINT="/media/card" -CF_MOUNTPOINT="/media/cf" - -HDD3_DEVICE="/dev/hda3" -HDD3_MOUNTPOINT="/media/hdd3" -HDD3_TYPE="vfat" - -SPITZ_HDD_PART="/dev/hda1" -SPITZ_HDD_TYPE="ext3" - -- cgit v1.2.3