Merge bk://oe-devel.bkbits.net/openembedded
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Wed, 25 May 2005 23:40:21 +0000 (23:40 +0000)
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>
Wed, 25 May 2005 23:40:21 +0000 (23:40 +0000)
into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/26 01:04:31+02:00 uni-frankfurt.de!mickeyl
altboot: use overrides system

BKrev: 42950ce5QeB3gbZaTJuKRvP37MDdtg

packages/altboot/altboot_cvs.bb
packages/altboot/files/collie/altboot.cfg [new file with mode: 0644]
packages/altboot/files_collie/altboot.cfg [deleted file]

index e69de29..855edbb 100644 (file)
@@ -0,0 +1,33 @@
+DESCRIPTION = "A text-based bootmanager allowing a Zaurus to boot from SD or CF. \
+Tested machines: Collie"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
+LICENSE = "GPL"
+PV = "0.0.1"
+PR = "r2"
+
+CVSDATE = "20051212"
+
+SRC_URI = "cvs://anonymous@hentges.net/hentgescvs;module=hentgescvs/hentges-utils/files;method=pserver \
+          file://altboot.cfg"
+S = "${WORKDIR}/files"
+do_install() {
+       install -d ${D}/sbin
+       install -d ${D}/etc/altboot-menu
+       
+       install -m 0644 ${WORKDIR}/altboot.cfg ${D}/etc
+       install -m 0755 init.altboot ${D}/sbin  
+       install -m 0755 altboot-menu/*-* ${D}/etc/altboot-menu
+}              
+
+
+
+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/collie/altboot.cfg b/packages/altboot/files/collie/altboot.cfg
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/packages/altboot/files_collie/altboot.cfg b/packages/altboot/files_collie/altboot.cfg
deleted file mode 100644 (file)
index 71d2ad4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Handled by /sbin/init.altboot
-# Allow booting images from SD or CF instead of booting
-# the ROM. 
-ENABLE_ALTBOOT="yes"
-REAL_INIT="/sbin/init.sysvinit"
-SH_SHELL="/bin/sh"
-IMAGE_PATH="boot-images"
-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"
-SD_MOUNTPOINT="/media/card"
-CF_MOUNTPOINT="/media/cf"