aboutsummaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-12-07 22:05:47 +0000
committerChris Larson <clarson@kergoth.com>2004-12-07 22:05:47 +0000
commita780643c4b6aa11e1a36965a69df7116477c7b4c (patch)
tree17e81e77bde19931facf9b30fa5b5981df796071 /conf/machine
parent88cce8db7ebf88ab9da2366a2ac21a5a723340b8 (diff)
downloadopenembedded-a780643c4b6aa11e1a36965a69df7116477c7b4c.tar.gz
Merge oe-devel@oe-devel.bkbits.net:packages.bb
into handhelds.org:/home/kergoth/code/packages.bb 2004/12/07 04:58:25-06:00 ti.com!kergoth More updates per the core rename. 2004/12/07 04:46:51-06:00 ti.com!kergoth Update soundtracker per the core rename. 2004/12/07 04:44:14-06:00 ti.com!kergoth Merge 2004/12/07 04:42:38-06:00 ti.com!kergoth Updates per the recent rename of the oe core from 'oe' to 'bitbake'. BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/boxer.conf2
-rw-r--r--conf/machine/zaurus-clamshell.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/conf/machine/boxer.conf b/conf/machine/boxer.conf
index e69de29bb2..6d3ea0f799 100644
--- a/conf/machine/boxer.conf
+++ b/conf/machine/boxer.conf
@@ -0,0 +1,2 @@
+WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C860,\n* because \
+it really is just a Sharp SL-C760 with a different case color. Use MACHINE = \"husky\".\n*\n*\n')}"
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index e931557e02..087ee9fe75 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -3,7 +3,7 @@ TARGET_ARCH = "arm"
# The machine specific PACKAGE_ARCH is set to zaurus-clamshell because
# machine specific packages (other than the kernel) are common across
# all the clamshell devices.
-MACHINE_ARCH = "${@['zaurus-clamshell', oe.data.getVar('MACHINE', d, 1)][oe.data.inherits_class('kernel', d) or oe.data.inherits_class('module-base', d) or oe.data.inherits_class('module', d)]}"
+MACHINE_ARCH = "${@['zaurus-clamshell', bb.data.getVar('MACHINE', d, 1)][bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d) or bb.data.inherits_class('module', d)]}"
IPKG_ARCHS = "all arm armv4 armv5te zaurus-clamshell ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"