summaryrefslogtreecommitdiff
path: root/meta-moblin/conf
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-12 20:32:43 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-12 20:32:43 +0000
commit4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75 (patch)
treecf3b794301daa2a62f69faec82fa6bf1f0132a63 /meta-moblin/conf
parentcf91cfaaa2ab909cb679bef3f8795e8bb89c96d4 (diff)
downloadopenembedded-core-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.tar.gz
openembedded-core-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.tar.bz2
openembedded-core-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.tar.xz
openembedded-core-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.zip
carrick: Add 1.1.13 release version and prefer over the git version for moblin
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta-moblin/conf')
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc3
-rw-r--r--meta-moblin/conf/distro/include/moblin-floating-revisions.inc1
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index d5552fc48..f644c5176 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -19,6 +19,9 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1"
PREFERRED_VERSION_libdrm ?= ""
PREFERRED_VERSION_xf86-input-keyboard ?= ""
PREFERRED_VERSION_dri2proto ?= ""
+PREFERRED_VERSION_carrick ?= "1.1.13"
+
+
SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4"
diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 3ac996df4..31ed13fd7 100644
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -9,6 +9,7 @@ SRCREV_pn-bickley ?= "${AUTOREV}"
SRCREV_pn-bisho ?= "${AUTOREV}"
SRCREV_pn-bognor-regis ?= "${AUTOREV}"
SRCREV_pn-carrick ?= "${AUTOREV}"
+PREFERRED_VERSION_carrick ?= "1.2.0+git%"
SRCREV_pn-clutter ?= "${AUTOREV}"
SRCREV_pn-clutter-1.0 ?= "${AUTOREV}"
SRCREV_pn-clutter-gtk ?= "${AUTOREV}"