summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc3
-rw-r--r--meta-moblin/conf/distro/include/moblin-floating-revisions.inc1
-rw-r--r--meta-moblin/packages/carrick/carrick.inc14
-rw-r--r--meta-moblin/packages/carrick/carrick_1.1.13.bb1
-rw-r--r--meta-moblin/packages/carrick/carrick_git.bb19
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"
19PREFERRED_VERSION_libdrm ?= "" 19PREFERRED_VERSION_libdrm ?= ""
20PREFERRED_VERSION_xf86-input-keyboard ?= "" 20PREFERRED_VERSION_xf86-input-keyboard ?= ""
21PREFERRED_VERSION_dri2proto ?= "" 21PREFERRED_VERSION_dri2proto ?= ""
22PREFERRED_VERSION_carrick ?= "1.1.13"
23
24
22SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e" 25SRCREV_pn-libdrm ?= "3f3c5be6f908272199ccf53f108b1124bfe0a00e"
23SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892" 26SRCREV_pn-xf86-input-keyboard ?= "3e28d68b50d291938734e9684b8296ca864f3892"
24SRCREV_pn-dri2proto ?= "66c56ab10d917e3f47f93178d7eac6430970d3c4" 27SRCREV_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}"
9SRCREV_pn-bisho ?= "${AUTOREV}" 9SRCREV_pn-bisho ?= "${AUTOREV}"
10SRCREV_pn-bognor-regis ?= "${AUTOREV}" 10SRCREV_pn-bognor-regis ?= "${AUTOREV}"
11SRCREV_pn-carrick ?= "${AUTOREV}" 11SRCREV_pn-carrick ?= "${AUTOREV}"
12PREFERRED_VERSION_carrick ?= "1.2.0+git%"
12SRCREV_pn-clutter ?= "${AUTOREV}" 13SRCREV_pn-clutter ?= "${AUTOREV}"
13SRCREV_pn-clutter-1.0 ?= "${AUTOREV}" 14SRCREV_pn-clutter-1.0 ?= "${AUTOREV}"
14SRCREV_pn-clutter-gtk ?= "${AUTOREV}" 15SRCREV_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 @@
1DESCIPTION = "Connection Management Panel Applet"
2SRC_URI = "http://download.moblin.org/sources/carrick/1.1/carrick-${PV}.tar.bz2"
3LICENSE = "GPLv2"
4
5DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
6RDEPENDS = "connman"
7
8FILES_${PN} += "${datadir}/icons/hicolor"
9
10inherit autotools_stage
11
12do_configure_prepend () {
13 mkdir -p ${S}/build/autotools
14}
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 @@
1DESCIPTION = "Connection Management Panel Applet" 1include carrick.inc
2SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git"
3LICENSE = "GPLv2"
4PV = "0.0+git${SRCPV}"
5PR = "r1"
6
7DEPENDS = "nbtk mutter-moblin librest libnotify mobile-broadband-provider-info"
8RDEPENDS = "connman"
9 2
3SRC_URI = "git://git.moblin.org/${PN}-ng.git;protocol=git"
4PV = "1.2.0+git${SRCPV}"
10S = "${WORKDIR}/git" 5S = "${WORKDIR}/git"
11
12FILES_${PN} += "${datadir}/icons/hicolor"
13
14inherit autotools_stage
15
16do_configure_prepend () {
17 mkdir -p ${S}/build/autotools
18}