[oe-commits] org.oe.dev merge of '66f82280631349e663f6931936195ed1819fcd86'

[oe commit]

merge of '66f82280631349e663f6931936195ed1819fcd86'
     and 'cfa480548db7b937e5fa73d80a37819a7c48609c'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: d714000fc8a6b75093a93f01782724b65d31eac1
ViewMTN: http://monotone.openembedded.org/revision/info/d714000fc8a6b75093a93f01782724b65d31eac1
Files:
1
conf/distro/angstrom-2008.1.conf
packages/hal/hal_0.5.9.bb
packages/tasks/task-boot.bb
packages/linux/compulab-pxa270_2.6.16.bb
packages/linux/compulab-pxa270_2.6.22.bb
Diffs:

#
# mt diff -r66f82280631349e663f6931936195ed1819fcd86 -rd714000fc8a6b75093a93f01782724b65d31eac1
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [7cf6cf9abb330a4454395b20a82b0387f94dab20]
#    to [aa3a5caf95a0bb29ce59432c8870f9fceb2776fc]
# 
# patch "packages/hal/hal_0.5.9.bb"
#  from [212571a9152068eeb0f89ea9731dbf0378ecd1b0]
#    to [2755b9938bea086e274d62d986064902f8cd8562]
# 
# patch "packages/tasks/task-boot.bb"
#  from [7ac26e95d7aaffe0b5e60aab60f1ddc2ffba85e1]
#    to [60ad04f700c75a0e13d10eb6be05890318c5b6ae]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	7cf6cf9abb330a4454395b20a82b0387f94dab20
+++ conf/distro/angstrom-2008.1.conf	aa3a5caf95a0bb29ce59432c8870f9fceb2776fc
@@ -8,7 +8,7 @@
 
 
 # Use Xorg R7.3 release
-require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
 
 # This is a testbed for unstable and/or untested things, while angstrom-2007.1 
@@ -42,3 +42,6 @@ PREFERRED_VERSION_pango                 
 PREFERRED_VERSION_glib-2.0              = "2.14.0"
 PREFERRED_VERSION_pango                 = "1.18.1"
 
+# prefer newest for speed and fun
+PREFERRED_VERSION_udev			= "115"
+
============================================================
--- 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
============================================================
--- 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 \


#
# mt diff -rcfa480548db7b937e5fa73d80a37819a7c48609c -rd714000fc8a6b75093a93f01782724b65d31eac1
#
# 
# 
# patch "packages/linux/compulab-pxa270_2.6.16.bb"
#  from [0c6af5bfc65c32891fcb4178365c351daae00104]
#    to [4694fb75afe6c5d1011a87d7d09c2782c995d519]
# 
# patch "packages/linux/compulab-pxa270_2.6.22.bb"
#  from [972387e153cfc5285e3c718e97c02bad8279ecb7]
#    to [06fe8124a9c0f6e1576a13c0cae5e27590f77c1d]
# 
============================================================
--- packages/linux/compulab-pxa270_2.6.16.bb	0c6af5bfc65c32891fcb4178365c351daae00104
+++ packages/linux/compulab-pxa270_2.6.16.bb	4694fb75afe6c5d1011a87d7d09c2782c995d519
@@ -68,5 +68,5 @@ addtask compulab_image before do_install
 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"
 
============================================================
--- packages/linux/compulab-pxa270_2.6.22.bb	972387e153cfc5285e3c718e97c02bad8279ecb7
+++ packages/linux/compulab-pxa270_2.6.22.bb	06fe8124a9c0f6e1576a13c0cae5e27590f77c1d
@@ -28,7 +28,7 @@ COMPATIBLE_HOST = 'arm.*-linux'
 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"