summaryrefslogtreecommitdiff
path: root/openembedded/conf/machine
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-03-25 23:31:04 +0000
committerRichard Purdie <richard@openedhand.com>2006-03-25 23:31:04 +0000
commitc597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d (patch)
tree9173fb365bf861e2337693179c270f81193f41b5 /openembedded/conf/machine
parent05ff3147c40087edece71449e375cdf588d7a29b (diff)
downloadopenembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.gz
openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.bz2
openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.tar.xz
openembedded-core-c597a2ec503afaaeb295fafd1d0d4c9c7bcbf38d.zip
Update xlibs to follow restructuring in OE (in preparation for X11R7)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@341 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf/machine')
-rw-r--r--openembedded/conf/machine/nokia770.conf2
-rw-r--r--openembedded/conf/machine/spitz.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/openembedded/conf/machine/nokia770.conf b/openembedded/conf/machine/nokia770.conf
index 3d6b7c0c3..41c485c01 100644
--- a/openembedded/conf/machine/nokia770.conf
+++ b/openembedded/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
#@NAME: Nokia 770 internet tablet
#@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te nokia770"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
PREFERRED_PROVIDER_virtual/bootloader = ""
diff --git a/openembedded/conf/machine/spitz.conf b/openembedded/conf/machine/spitz.conf
index e1cb468d8..212da5258 100644
--- a/openembedded/conf/machine/spitz.conf
+++ b/openembedded/conf/machine/spitz.conf
@@ -7,7 +7,7 @@ KERNEL_VERSION ?= "2.6"
include conf/machine/include/zaurus-clamshell.conf
include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
PIVOTBOOT_EXTRA_RRECOMMENDS += ""
# Useful things for the built-in Harddisk