diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-12 20:32:43 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-01-12 20:32:43 +0000 |
commit | 4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75 (patch) | |
tree | cf3b794301daa2a62f69faec82fa6bf1f0132a63 /meta-moblin/conf | |
parent | cf91cfaaa2ab909cb679bef3f8795e8bb89c96d4 (diff) | |
download | poky-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.tar.gz |
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.inc | 3 | ||||
-rw-r--r-- | meta-moblin/conf/distro/include/moblin-floating-revisions.inc | 1 |
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 d5552fc482..f644c51762 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" | |||
19 | PREFERRED_VERSION_libdrm ?= "" | 19 | PREFERRED_VERSION_libdrm ?= "" |
20 | PREFERRED_VERSION_xf86-input-keyboard ?= "" | 20 | PREFERRED_VERSION_xf86-input-keyboard ?= "" |
21 | PREFERRED_VERSION_dri2proto ?= "" | 21 | PREFERRED_VERSION_dri2proto ?= "" |
22 | PREFERRED_VERSION_carrick ?= "1.1.13" | ||
23 | |||
24 | |||
22 | SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" | 25 | SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" |
23 | SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892" | 26 | SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892" |
24 | SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4" | 27 | 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 3ac996df42..31ed13fd78 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}" | |||
9 | SRCREV_pn-bisho ?= "${AUTOREV}" | 9 | SRCREV_pn-bisho ?= "${AUTOREV}" |
10 | SRCREV_pn-bognor-regis ?= "${AUTOREV}" | 10 | SRCREV_pn-bognor-regis ?= "${AUTOREV}" |
11 | SRCREV_pn-carrick ?= "${AUTOREV}" | 11 | SRCREV_pn-carrick ?= "${AUTOREV}" |
12 | PREFERRED_VERSION_carrick ?= "1.2.0+git%" | ||
12 | SRCREV_pn-clutter ?= "${AUTOREV}" | 13 | SRCREV_pn-clutter ?= "${AUTOREV}" |
13 | SRCREV_pn-clutter-1.0 ?= "${AUTOREV}" | 14 | SRCREV_pn-clutter-1.0 ?= "${AUTOREV}" |
14 | SRCREV_pn-clutter-gtk ?= "${AUTOREV}" | 15 | SRCREV_pn-clutter-gtk ?= "${AUTOREV}" |