diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-06 21:42:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-10-06 21:42:58 +0000 |
| commit | 62007cb1fac3e5a7f4a09b61c7d3c3b7cd5fc8a7 (patch) | |
| tree | 24c8a0982ffb9d6339ccae067f8310bd4dc9dae0 | |
| parent | b4c25abff2ced8801f5b09c6b2be26ce672e323a (diff) | |
| parent | 8acf0bf20e7d1f4fb89de4df260fb7b4c83cb9d5 (diff) | |
merge of '66f82280631349e663f6931936195ed1819fcd86'
and 'cfa480548db7b937e5fa73d80a37819a7c48609c'
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 5 | ||||
| -rw-r--r-- | packages/hal/hal_0.5.9.bb | 22 | ||||
| -rw-r--r-- | packages/tasks/task-boot.bb | 3 |
3 files changed, 17 insertions, 13 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index 60557325a9..cdf2970201 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -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_gtk+ = "2.12.0" PREFERRED_VERSION_glib-2.0 = "2.14.0" PREFERRED_VERSION_pango = "1.18.1" +# prefer newest for speed and fun +PREFERRED_VERSION_udev = "115" + 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/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 \ |