diff options
author | Koen Kooi <koen@openembedded.org> | 2006-07-29 20:44:42 +0000 |
---|---|---|
committer | Koen Kooi <koen@openembedded.org> | 2006-07-29 20:44:42 +0000 |
commit | 65d153d4833f9aba1ee349abfcb7f76ab61e6e31 (patch) | |
tree | 24e1d9163571b3abb72e6d9bb02edcd76a0fb8cb | |
parent | 4d5afc06289245a53c9f60fd27882eb2ad48d6cc (diff) | |
parent | a8774bdc398d97ded23d48614393b03cbd7af376 (diff) |
merge of '7ca686a64736f6787bbb283a3f9d21966212d549'
and 'b3c3672e33744be20e96f868564159e2b02bb718'
-rw-r--r-- | packages/altboot/altboot_0.0.0.bb | 2 | ||||
-rw-r--r-- | packages/altboot/files/altboot.func | 2 | ||||
-rw-r--r-- | packages/altboot/files/poodle/altboot-2.6.cfg | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/packages/altboot/altboot_0.0.0.bb b/packages/altboot/altboot_0.0.0.bb index b604da188a..83382f57a0 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 = "r44" +PR = "r45" ###################################################################################### diff --git a/packages/altboot/files/altboot.func b/packages/altboot/files/altboot.func index 9a0b139bfb..7457f66822 100644 --- a/packages/altboot/files/altboot.func +++ b/packages/altboot/files/altboot.func @@ -77,7 +77,7 @@ check_target() { if test "$real_fs_found" != 1 -a "$image_found" != 1 then - die "Nothing to do!" + mdie "No direct-install or loop-images found. Nothing to do!" fi } diff --git a/packages/altboot/files/poodle/altboot-2.6.cfg b/packages/altboot/files/poodle/altboot-2.6.cfg index f55e77b8f0..d976ee3a20 100644 --- a/packages/altboot/files/poodle/altboot-2.6.cfg +++ b/packages/altboot/files/poodle/altboot-2.6.cfg @@ -10,7 +10,7 @@ TIMEOUT="4" REAL_INIT="/sbin/init.sysvinit" SH_SHELL="/bin/sh" -ENABLE_SOUND="no" +ENABLE_SOUND="yes" IMAGE_PATH="boot-images" IMAGE_TYPE="ext2" @@ -20,7 +20,7 @@ ENABLE_IMAGECONF="yes" SD_DEVICE="/dev/mmcblk0p1" SD_KERNEL_MODULE="" -USB_HOST_AVAILABLE="yes" +USB_HOST_AVAILABLE="no" USB_STORAGE_MODULES="ohci_hcd usb_storage sd_mod" USB_STORAGE_PARTITION="/dev/sda1" USB_STORAGE_WAIT="4" |