summaryrefslogtreecommitdiff
path: root/openembedded/conf
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-05-30 18:04:51 +0000
committerRichard Purdie <richard@openedhand.com>2006-05-30 18:04:51 +0000
commitdeba905a8052511b88be064324145553cf583f9f (patch)
tree13b8d05cb89995e35813ba6e2fc0128a01fed82e /openembedded/conf
parent0e376c137102124dafaaeec467f9f861e0725b9f (diff)
downloadopenembedded-core-deba905a8052511b88be064324145553cf583f9f.tar.gz
openembedded-core-deba905a8052511b88be064324145553cf583f9f.tar.bz2
openembedded-core-deba905a8052511b88be064324145553cf583f9f.tar.xz
openembedded-core-deba905a8052511b88be064324145553cf583f9f.zip
poky.conf: Allow PCMCIA_MANAGER to be overridden and bump matchbox-keyboard SRCDATE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@455 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/conf')
-rw-r--r--openembedded/conf/distro/poky.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/openembedded/conf/distro/poky.conf b/openembedded/conf/distro/poky.conf
index d43df4dd9..6614218c2 100644
--- a/openembedded/conf/distro/poky.conf
+++ b/openembedded/conf/distro/poky.conf
@@ -83,7 +83,7 @@ SRCDATE_ipkg-link ?= "20050930"
SRCDATE_matchbox-common ?= "20051101"
SRCDATE_matchbox-config-gtk ?= "20051101"
SRCDATE_matchbox-desktop ?= "20060120"
-SRCDATE_matchbox-keyboard ?= "20060526"
+SRCDATE_matchbox-keyboard ?= "20060531"
SRCDATE_matchbox-panel ?= "20051101"
SRCDATE_matchbox-panel-manager ?= "20051101"
SRCDATE_matchbox-stroke ?= "20051101"
@@ -167,4 +167,4 @@ PREFERRED_VERSION_xrdb ?= "0.0+cvs${SRCDATE}"
PREFERRED_VERSION_xst ?= "0.15"
PREFERRED_VERSION_oprofile ?= "0.9.1+cvs${SRCDATE}"
-PCMCIA_MANAGER = "pcmciautils"
+PCMCIA_MANAGER ?= "pcmciautils"