[oe-commits] org.oe.dev merge of 'aac972a11d5683b639123784bea6534e132ad36d'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sun Oct 7 04:30:01 UTC 2007
merge of 'aac972a11d5683b639123784bea6534e132ad36d'
and 'd714000fc8a6b75093a93f01782724b65d31eac1'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 5057b0d0a8cd261e84871fecfebfa818b91794ae
ViewMTN: http://monotone.openembedded.org/revision/info/5057b0d0a8cd261e84871fecfebfa818b91794ae
Files:
1
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
conf/distro/angstrom-2008.1.conf
packages/hal/hal_0.5.9.bb
packages/linux/compulab-pxa270_2.6.16.bb
packages/linux/compulab-pxa270_2.6.22.bb
packages/tasks/task-boot.bb
packages/slugos-init/files/modulefunctions
packages/slugos-init/slugos-init_0.10.bb
packages/tasks/task-slugos.bb
Diffs:
#
# mt diff -raac972a11d5683b639123784bea6534e132ad36d -r5057b0d0a8cd261e84871fecfebfa818b91794ae
#
#
#
# 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/distro/angstrom-2008.1.conf"
# from [7cf6cf9abb330a4454395b20a82b0387f94dab20]
# to [aa3a5caf95a0bb29ce59432c8870f9fceb2776fc]
#
# patch "conf/machine/cm-x270.conf"
# from [030387a4a7a870fe4a02783a30be65b1b9752695]
# to [dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de]
#
# patch "packages/hal/hal_0.5.9.bb"
# from [212571a9152068eeb0f89ea9731dbf0378ecd1b0]
# to [2755b9938bea086e274d62d986064902f8cd8562]
#
# 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]
#
# 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"
+
============================================================
--- 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/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/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"
============================================================
--- 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 -rd714000fc8a6b75093a93f01782724b65d31eac1 -r5057b0d0a8cd261e84871fecfebfa818b91794ae
#
#
#
# patch "packages/slugos-init/files/modulefunctions"
# from [2fa625b35ea31712fde433431b13ec9b7c79d43b]
# to [4b87b10cbcadb95da00017ee6f9d7f80b767719b]
#
# patch "packages/slugos-init/slugos-init_0.10.bb"
# from [b86dcf4eeaea00eac2b46b43ce047bfcb81bec2e]
# to [35c419193e544a8d85ce740472291aa93c87fd37]
#
# patch "packages/tasks/task-slugos.bb"
# from [886169eff4c43655de9f427988ddbe1c01deab8f]
# to [6828037c6d95ea3758b661c5277817df96d75b69]
#
============================================================
--- packages/slugos-init/files/modulefunctions 2fa625b35ea31712fde433431b13ec9b7c79d43b
+++ packages/slugos-init/files/modulefunctions 4b87b10cbcadb95da00017ee6f9d7f80b767719b
@@ -6,15 +6,18 @@ loaddiskmods(){
loaddiskmods(){
case "$(machine)" in
nslu2)
+ modprobe ehci-hcd
modprobe ohci-hcd
;;
nas100d)
+ modprobe ehci-hcd
+ modprobe uhci-hcd
modprobe pata-artop
- modprobe uhci-hcd
;;
dsmg600)
- modprobe pata-artop
+ modprobe ehci-hcd
modprobe uhci-hcd
+ modprobe pata-artop
;;
esac
============================================================
--- packages/slugos-init/slugos-init_0.10.bb b86dcf4eeaea00eac2b46b43ce047bfcb81bec2e
+++ packages/slugos-init/slugos-init_0.10.bb 35c419193e544a8d85ce740472291aa93c87fd37
@@ -1,10 +1,10 @@ RDEPENDS = "busybox devio"
DESCRIPTION = "SlugOS initial network config via sysconf"
SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "base-files devio"
RDEPENDS = "busybox devio"
-PR = "r88"
+PR = "r89"
SRC_URI = "file://boot/flash \
file://boot/disk \
============================================================
--- packages/tasks/task-slugos.bb 886169eff4c43655de9f427988ddbe1c01deab8f
+++ packages/tasks/task-slugos.bb 6828037c6d95ea3758b661c5277817df96d75b69
@@ -6,7 +6,7 @@ LICENSE = "MIT"
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r14"
+PR = "r15"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -76,6 +76,7 @@ SLUGOS_STANDARD_RRECOMMENDS += "\
# Add modules required for usb support
SLUGOS_STANDARD_RRECOMMENDS += "\
+kernel-module-ehci-hcd \
kernel-module-ohci-hcd \
kernel-module-uhci-hcd \
"
More information about the Openembedded-commits
mailing list