summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-06-17 15:42:01 +0000
committerRichard Purdie <richard@openedhand.com>2008-06-17 15:42:01 +0000
commit50f13f955a072b8f249e99eef45e95df7b25c713 (patch)
treed113b96f1484fe4e224c1e62ebb6d0102a6f0860 /meta
parent30d39ad5785beb8a1d5f02614a5207f227d73e24 (diff)
downloadpoky-50f13f955a072b8f249e99eef45e95df7b25c713.tar.gz
opensync/syncml: Sync with changes in layout upstream
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4684 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/opensync/libopensync-plugin-syncml_0.22.bb1
-rw-r--r--meta/packages/opensync/libopensync-plugin-syncml_svn.bb (renamed from meta/packages/opensync/libopensync-plugin-syncml-plugin.bb)0
-rw-r--r--meta/packages/opensync/libopensync-plugin_0.22.inc8
-rw-r--r--meta/packages/opensync/libopensync_0.22.bb6
-rw-r--r--meta/packages/opensync/libopensync_svn.bb2
-rw-r--r--meta/packages/opensync/msynctool_0.22.bb4
-rw-r--r--meta/packages/opensync/msynctool_svn.bb4
-rw-r--r--meta/packages/opensync/opensync-unpack.inc5
8 files changed, 10 insertions, 20 deletions
diff --git a/meta/packages/opensync/libopensync-plugin-syncml_0.22.bb b/meta/packages/opensync/libopensync-plugin-syncml_0.22.bb
index 2a26eb1674..65206ee2e2 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml_0.22.bb
+++ b/meta/packages/opensync/libopensync-plugin-syncml_0.22.bb
@@ -1,5 +1,6 @@
1 1
2require libopensync-plugin.inc 2require libopensync-plugin.inc
3require libopensync-plugin_0.22.inc
3 4
4DEPENDS += " libsyncml" 5DEPENDS += " libsyncml"
5 6
diff --git a/meta/packages/opensync/libopensync-plugin-syncml-plugin.bb b/meta/packages/opensync/libopensync-plugin-syncml_svn.bb
index 0a7d82db74..0a7d82db74 100644
--- a/meta/packages/opensync/libopensync-plugin-syncml-plugin.bb
+++ b/meta/packages/opensync/libopensync-plugin-syncml_svn.bb
diff --git a/meta/packages/opensync/libopensync-plugin_0.22.inc b/meta/packages/opensync/libopensync-plugin_0.22.inc
index 03857dce53..31709e8b28 100644
--- a/meta/packages/opensync/libopensync-plugin_0.22.inc
+++ b/meta/packages/opensync/libopensync-plugin_0.22.inc
@@ -1,12 +1,6 @@
1PV = "0.22" 1PV = "0.22"
2PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}" 2PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}"
3SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw" 3SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2"
4 4
5S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/" 5S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/"
6 6
7do_unpack2() {
8 cd ${WORKDIR} && tar jxf libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw
9}
10
11addtask unpack2 after do_unpack before do_patch
12
diff --git a/meta/packages/opensync/libopensync_0.22.bb b/meta/packages/opensync/libopensync_0.22.bb
index ed4ef740bc..be43558947 100644
--- a/meta/packages/opensync/libopensync_0.22.bb
+++ b/meta/packages/opensync/libopensync_0.22.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.opensync.org/"
3 3
4DEPENDS = "sqlite3 libxml2 zlib glib-2.0" 4DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
5 5
6SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw" 6SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-0.22.tar.bz2"
7 7
8inherit autotools pkgconfig lib_package 8inherit autotools pkgconfig lib_package
9 9
@@ -13,9 +13,7 @@ LEAD_SONAME = "libopensync.so"
13FILES_${PN} += " ${libdir}/opensync/formats/*.so" 13FILES_${PN} += " ${libdir}/opensync/formats/*.so"
14FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so" 14FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so"
15 15
16require opensync-unpack.inc
17
18do_stage() { 16do_stage() {
19autotools_stage_all 17 autotools_stage_all
20} 18}
21 19
diff --git a/meta/packages/opensync/libopensync_svn.bb b/meta/packages/opensync/libopensync_svn.bb
index 9d17684f39..a09cdd2a82 100644
--- a/meta/packages/opensync/libopensync_svn.bb
+++ b/meta/packages/opensync/libopensync_svn.bb
@@ -9,6 +9,8 @@ SRC_URI = "svn://svn.opensync.org;module=trunk;proto=http \
9 file://zlib.patch;patch=1 \ 9 file://zlib.patch;patch=1 \
10 file://no-werror.patch;patch=1" 10 file://no-werror.patch;patch=1"
11 11
12DEFAULT_PREFERENCE = "-1"
13
12inherit scons 14inherit scons
13 15
14S = "${WORKDIR}/trunk" 16S = "${WORKDIR}/trunk"
diff --git a/meta/packages/opensync/msynctool_0.22.bb b/meta/packages/opensync/msynctool_0.22.bb
index 018c227e36..694103c4de 100644
--- a/meta/packages/opensync/msynctool_0.22.bb
+++ b/meta/packages/opensync/msynctool_0.22.bb
@@ -1,9 +1,7 @@
1SRC_URI = "http://www.opensync.org/attachment/wiki/download/msynctool-0.22.tar.bz2?format=raw" 1SRC_URI = "http://www.opensync.org/download/releases/0.22/msynctool-0.22.tar.bz2"
2 2
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "libopensync" 4DEPENDS = "libopensync"
5HOMEPAGE = "http://www.opensync.org/" 5HOMEPAGE = "http://www.opensync.org/"
6 6
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8
9require opensync-unpack.inc
diff --git a/meta/packages/opensync/msynctool_svn.bb b/meta/packages/opensync/msynctool_svn.bb
index 88cb8f4b54..31be2c9cbf 100644
--- a/meta/packages/opensync/msynctool_svn.bb
+++ b/meta/packages/opensync/msynctool_svn.bb
@@ -3,7 +3,9 @@ DEPENDS = "libopensync"
3HOMEPAGE = "http://www.opensync.org/" 3HOMEPAGE = "http://www.opensync.org/"
4PV = "0.22+svnr${SRCREV}" 4PV = "0.22+svnr${SRCREV}"
5 5
6DEFAULT_PREFERENCE = "-1"
7
6SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http" 8SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http"
7S = "${WORKDIR}/trunk" 9S = "${WORKDIR}/trunk"
8 10
9inherit autotools pkgconfig 11inherit autotools pkgconfig scons
diff --git a/meta/packages/opensync/opensync-unpack.inc b/meta/packages/opensync/opensync-unpack.inc
deleted file mode 100644
index d5443187bd..0000000000
--- a/meta/packages/opensync/opensync-unpack.inc
+++ /dev/null
@@ -1,5 +0,0 @@
1do_unpack2() {
2 cd ${WORKDIR} && tar jxf ${PN}-${PV}.tar.bz2?format=raw
3}
4
5addtask unpack2 after do_unpack before do_patch