merge of 'aac972a11d5683b639123784bea6534e132ad36d'

     and 'd714000fc8a6b75093a93f01782724b65d31eac1'

6 files changed, 15 insertions, 14 deletions

diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index 72d5dc4e2d..03c45623a4 100644
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -5,28 +5,28 @@ RDEPENDS += "udev hal-info"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://99_hal \
             file://20hal \
 	   "
 
+# machines with pci and acpi get a machine dependant hal
 EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
                 --with-expat=${STAGING_LIBDIR}/.. \
                 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
                 --with-hotplug=${sysconfdir}/hotplug.d \
                 --disable-docbook-docs \
                 --disable-policy-kit \
-                --disable-acpi --disable-pmu --disable-pci \
-                --disable-pci-ids --disable-pnp-ids \
-                "
-
-# work around autoconf >2.59 deps...
-do_configure() {
-	gnu-configize
-	libtoolize --force
-	oe_runconf
-}
+                --disable-pmu \
+                --disable-pnp-ids \
+                ${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \
+                ${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \
+               "
+
+MY_ARCH := "${PACKAGE_ARCH}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'acpi', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
+PACKAGE_ARCH = "${@base_contains('MACHINE_FEATURES', 'pci', '${MACHINE_ARCH}', '${MY_ARCH}',d)}"
 
 do_install_append() {
 	install -d ${D}/etc/default/volatiles
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index ce6748149b..bd3135510f 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -68,5 +68,5 @@ do_deploy[dirs] = "${S}"
 addtask deploy before do_install after do_compile
 addtask compulab_image before do_install after do_deploy
 
-COMPATIBLE_MACHINE = "compulab-pxa270"
+COMPATIBLE_MACHINE = "cm-x270"
 
diff --git a/packages/linux/compulab-pxa270_2.6.22.bb b/packages/linux/compulab-pxa270_2.6.22.bb
index 86a7626d8a..84c1c63367 100644
--- a/packages/linux/compulab-pxa270_2.6.22.bb
+++ b/packages/linux/compulab-pxa270_2.6.22.bb
@@ -28,7 +28,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_HOST = 'arm.*-linux'
-COMPATIBLE_MACHINE = "compulab-pxa270"
+COMPATIBLE_MACHINE = "cm-x270"
 
 CMDLINE = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
 
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index 40c5bd530b..fb09ad1a83 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Basic task to get a device booting"
-PR = "r40"
+PR = "r41"
 
 inherit task
 
@@ -40,6 +40,7 @@ RDEPENDS_task-boot = "\
     base-passwd \
     busybox \
     initscripts \
+    ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
     modutils-initscripts \
     netbase \
     update-alternatives \
diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty
+++ b/packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine
index e27931cf6b..e27931cf6b 100644
--- a/packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine
+++ b/packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine