diff options
| -rw-r--r-- | conf/distro/angstrom-2008.1.conf | 5 | ||||
| -rw-r--r-- | conf/machine/cm-x270.conf (renamed from conf/machine/compulab-pxa270.conf) | 8 | ||||
| -rw-r--r-- | packages/hal/hal_0.5.9.bb | 22 | ||||
| -rw-r--r-- | packages/linux/compulab-pxa270_2.6.16.bb | 2 | ||||
| -rw-r--r-- | packages/linux/compulab-pxa270_2.6.22.bb | 2 | ||||
| -rw-r--r-- | packages/tasks/task-boot.bb | 3 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-0.9.29/cm-x270/.mtn2git_empty (renamed from packages/uclibc/uclibc-0.9.29/compulab-pxa270/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/uclibc/uclibc-0.9.29/cm-x270/uClibc.machine (renamed from packages/uclibc/uclibc-0.9.29/compulab-pxa270/uClibc.machine) | 0 |
8 files changed, 23 insertions, 19 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/conf/machine/compulab-pxa270.conf b/conf/machine/cm-x270.conf index ff0eb42a11..c712c3728e 100644 --- a/conf/machine/compulab-pxa270.conf +++ b/conf/machine/cm-x270.conf @@ -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 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 |