[oe-commits] org.oe.dev merge of '1071338fe9143d91f11215f627150ab1adc3a923'

[koen commit]

merge of '1071338fe9143d91f11215f627150ab1adc3a923'
     and '2cffc57d52392fbeabd7156350a781b1a803493e'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: cfa480548db7b937e5fa73d80a37819a7c48609c
ViewMTN: http://monotone.openembedded.org/revision/info/cfa480548db7b937e5fa73d80a37819a7c48609c
Files:
1
packages/hal/hal_0.5.9.bb
conf/machine/compulab-pxa270.conf
conf/machine/cm-x270.conf
packages/uclibc/uclibc-0.9.29/compulab-pxa270
packages/uclibc/uclibc-0.9.29/cm-x270
packages/tasks/task-boot.bb
Diffs:

#
# mt diff -r1071338fe9143d91f11215f627150ab1adc3a923 -rcfa480548db7b937e5fa73d80a37819a7c48609c
#
# 
# 
# patch "packages/hal/hal_0.5.9.bb"
#  from [212571a9152068eeb0f89ea9731dbf0378ecd1b0]
#    to [2755b9938bea086e274d62d986064902f8cd8562]
# 
============================================================
--- packages/hal/hal_0.5.9.bb	212571a9152068eeb0f89ea9731dbf0378ecd1b0
+++ packages/hal/hal_0.5.9.bb	2755b9938bea086e274d62d986064902f8cd8562
@@ -5,28 +5,28 @@ RRECOMMENDS = "udev-utils"
 #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 \
-                "
+                --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)} \
+               "
 
-# work around autoconf >2.59 deps...
-do_configure() {
-	gnu-configize
-	libtoolize --force
-	oe_runconf
-}
+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


#
# mt diff -r2cffc57d52392fbeabd7156350a781b1a803493e -rcfa480548db7b937e5fa73d80a37819a7c48609c
#
# 
# 
# rename "conf/machine/compulab-pxa270.conf"
#     to "conf/machine/cm-x270.conf"
# 
# rename "packages/uclibc/uclibc-0.9.29/compulab-pxa270"
#     to "packages/uclibc/uclibc-0.9.29/cm-x270"
# 
# patch "conf/machine/cm-x270.conf"
#  from [030387a4a7a870fe4a02783a30be65b1b9752695]
#    to [dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de]
# 
# patch "packages/tasks/task-boot.bb"
#  from [7ac26e95d7aaffe0b5e60aab60f1ddc2ffba85e1]
#    to [60ad04f700c75a0e13d10eb6be05890318c5b6ae]
# 
============================================================
--- conf/machine/compulab-pxa270.conf	030387a4a7a870fe4a02783a30be65b1b9752695
+++ conf/machine/cm-x270.conf	dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de
@@ -1,12 +1,12 @@
 #@TYPE: Machine
-#@Name: Compulab PXA270 system
-#@DESCRIPTION: Machine configuration for Compulab PXA270 system
+#@Name: Compulab cm-x270
+#@DESCRIPTION: Machine configuration for Compulab cm-x270 computer module
 #OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
 PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 require conf/machine/include/tune-xscale.inc
@@ -21,7 +21,7 @@ CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
 # used by sysvinit_2 package, so rebuild this
 # package if you change the SERIAL_CONSOLE setting
-# the following is the for the cm-x270 L module
+# the following is the port for the cm-x270 L module
 # I think the W module would use ttyS0, but has
 # not been tested.  This can be overwritten in 
 # local.conf
============================================================
--- packages/tasks/task-boot.bb	7ac26e95d7aaffe0b5e60aab60f1ddc2ffba85e1
+++ packages/tasks/task-boot.bb	60ad04f700c75a0e13d10eb6be05890318c5b6ae
@@ -1,5 +1,5 @@ DESCRIPTION = "Basic task to get a devic
 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 \