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 | |
| parent | cf91cfaaa2ab909cb679bef3f8795e8bb89c96d4 (diff) | |
| download | openembedded-core-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.tar.gz openembedded-core-4108af2ac7c60ae6cbb9ae4b322a34d5cc19fe75.tar.bz2 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')
5 files changed, 22 insertions, 16 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" 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 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}" 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}" diff --git a/meta-moblin/packages/carrick/carrick.inc b/meta-moblin/packages/carrick/carrick.inc new file mode 100644 index 0000000000..f40aa26c41 --- /dev/null +++ b/meta-moblin/packages/carrick/carrick.inc @@ -0,0 +1,14 @@ +DESCIPTION = "Connection Management Panel Applet" +SRC_URI = "http://download.moblin.org/sources/carrick/1.1/carrick-${PV}.tar.bz2" +LICENSE = "GPLv2" + +DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info" +RDEPENDS = "connman" + +FILES_${PN} += "${datadir}/icons/hicolor" + +inherit autotools_stage + +do_configure_prepend () { + mkdir -p ${S}/build/autotools +} diff --git a/meta-moblin/packages/carrick/carrick_1.1.13.bb b/meta-moblin/packages/carrick/carrick_1.1.13.bb new file mode 100644 index 0000000000..f7ec5c017b --- /dev/null +++ b/meta-moblin/packages/carrick/carrick_1.1.13.bb @@ -0,0 +1 @@ +include carrick.inc diff --git a/meta-moblin/packages/carrick/carrick_git.bb b/meta-moblin/packages/carrick/carrick_git.bb index 10b402c819..3258e052b7 100644 --- a/meta-moblin/packages/carrick/carrick_git.bb +++ b/meta-moblin/packages/carrick/carrick_git.bb @@ -1,18 +1,5 @@ -DESCIPTION = "Connection Management Panel Applet" -SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git" -LICENSE = "GPLv2" -PV = "0.0+git${SRCPV}" -PR = "r1" - -DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info" -RDEPENDS = "connman" +include carrick.inc +SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git" +PV = "1.2.0+git${SRCPV}" S = "${WORKDIR}/git" - -FILES_${PN} += "${datadir}/icons/hicolor" - -inherit autotools_stage - -do_configure_prepend () { - mkdir -p ${S}/build/autotools -} |