diff options
author | Matthias Hentges <oe@hentges.net> | 2006-05-10 16:01:50 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-05-10 16:01:50 +0000 |
commit | be9175725b1da2e5b3c24e648e8bf84e7af8a206 (patch) | |
tree | 44dbd27c21f9154fd64033d208ccf5898aadd1cf /packages/altboot | |
parent | daaad9d6cf3ee1021496a2fb5d4cf30702d85fc9 (diff) |
altboot: Add 1.0.7-rc3, containing kernel 2.6 Poodle and Tosa configs
Diffstat (limited to 'packages/altboot')
-rw-r--r-- | packages/altboot/altboot_0.0.0.bb | 2 | ||||
-rw-r--r-- | packages/altboot/altboot_1.0.7-rc3.bb (renamed from packages/altboot/altboot_1.0.7-rc2.bb) | 39 | ||||
-rw-r--r-- | packages/altboot/files/akita/altboot-2.6.cfg | 2 | ||||
-rw-r--r-- | packages/altboot/files/altboot.rc/playbeep.sh | 2 | ||||
-rw-r--r-- | packages/altboot/files/c7x0/altboot-2.6.cfg | 2 | ||||
-rw-r--r-- | packages/altboot/files/poodle/altboot-2.6.cfg | 2 | ||||
-rw-r--r-- | packages/altboot/files/spitz/altboot-2.6.cfg | 2 | ||||
-rw-r--r-- | packages/altboot/files/tosa/altboot-2.6.cfg | 2 |
8 files changed, 32 insertions, 21 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index 2935dedc30..2782ad1e3c 100644 --- 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 = "r42" +PR = "r43" ###################################################################################### diff --git a/packages/altboot/altboot_1.0.7-rc2.bb b/packages/altboot/altboot_1.0.7-rc3.bb index 385e30907e..245cf2a426 100644 --- a/packages/altboot/altboot_1.0.7-rc2.bb +++ b/packages/altboot/altboot_1.0.7-rc3.bb @@ -13,10 +13,13 @@ LICENSE = "GPL" ###################################################################################### -RRECOMMENDS = "e2fsprogs-e2fsck dosfstools" -RRECOMMENDS_append_akita = " kexec-tools" -RRECOMMENDS_append_spitz = " kexec-tools" -RRECOMMENDS_append_c7x0 = " kexec-tools" +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}" ###################################################################################### @@ -24,7 +27,11 @@ PR = "r0" ###################################################################################### -PACKAGE_ARCH = "${MACHINE}" +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('.', '-')}" @@ -34,6 +41,10 @@ S = "${WORKDIR}/altboot/" ###################################################################################### +FILES_${PN}-conf = "/etc/altboot*.cfg" + +###################################################################################### + do_install() { install -d ${D}/sbin install -d ${D}/etc/altboot-menu @@ -53,19 +64,9 @@ do_install() { 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 + install -m 0755 ${WORKDIR}/altboot/altboot-menu/*-* ${D}/etc/altboot-menu - 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-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 @@ -80,13 +81,13 @@ do_configure() { ###################################################################################### -pkg_postinst() { +pkg_postinst_${PN}() { update-alternatives --install /sbin/init init /sbin/init.altboot 55 } ###################################################################################### -pkg_postrm() { +pkg_postrm_${PN}() { update-alternatives --remove init /sbin/init.altboot } diff --git a/packages/altboot/files/akita/altboot-2.6.cfg b/packages/altboot/files/akita/altboot-2.6.cfg index 66b68d1e5c..62e8ea2434 100644 --- a/packages/altboot/files/akita/altboot-2.6.cfg +++ b/packages/altboot/files/akita/altboot-2.6.cfg @@ -10,6 +10,8 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" +ENABLE_SOUND="yes" + IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" diff --git a/packages/altboot/files/altboot.rc/playbeep.sh b/packages/altboot/files/altboot.rc/playbeep.sh index 6cc5b8bcdf..9ef6a0c41b 100644 --- a/packages/altboot/files/altboot.rc/playbeep.sh +++ b/packages/altboot/files/altboot.rc/playbeep.sh @@ -6,7 +6,7 @@ # Filename: playbeep.sh # Date: 12-Apr-06 -if test -x /usr/sbin/alsactl -a -e /etc/modules +if test -x /usr/sbin/alsactl -a -e /etc/modules -a "$ENABLE_SOUND" = yes then for module in `cat /etc/modules | grep snd | grep -v ^#` do diff --git a/packages/altboot/files/c7x0/altboot-2.6.cfg b/packages/altboot/files/c7x0/altboot-2.6.cfg index 71c4c29dc2..8d91602b25 100644 --- a/packages/altboot/files/c7x0/altboot-2.6.cfg +++ b/packages/altboot/files/c7x0/altboot-2.6.cfg @@ -10,6 +10,8 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" +ENABLE_SOUND="yes" + IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg index 66b68d1e5c..f55e77b8f0 100644 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ b/packages/altboot/files/poodle/altboot-2.6.cfg @@ -10,6 +10,8 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" +ENABLE_SOUND="no" + IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" diff --git a/packages/altboot/files/spitz/altboot-2.6.cfg b/packages/altboot/files/spitz/altboot-2.6.cfg index a8da33463d..0a2b643b76 100644 --- a/packages/altboot/files/spitz/altboot-2.6.cfg +++ b/packages/altboot/files/spitz/altboot-2.6.cfg @@ -10,6 +10,8 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" +ENABLE_SOUND="yes" + IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" diff --git a/packages/altboot/files/tosa/altboot-2.6.cfg b/packages/altboot/files/tosa/altboot-2.6.cfg index 66b68d1e5c..62e8ea2434 100644 --- a/packages/altboot/files/tosa/altboot-2.6.cfg +++ b/packages/altboot/files/tosa/altboot-2.6.cfg @@ -10,6 +10,8 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" +ENABLE_SOUND="yes" + IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" FSCK_IMAGES="yes" |