summaryrefslogtreecommitdiff
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-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 2a26eb167..65206ee2e 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 @@
require libopensync-plugin.inc
+require libopensync-plugin_0.22.inc
DEPENDS += " libsyncml"
diff --git a/meta/packages/opensync/libopensync-plugin-syncml-plugin.bb b/meta/packages/opensync/libopensync-plugin-syncml_svn.bb
index 0a7d82db7..0a7d82db7 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 03857dce5..31709e8b2 100644
--- a/meta/packages/opensync/libopensync-plugin_0.22.inc
+++ b/meta/packages/opensync/libopensync-plugin_0.22.inc
@@ -1,12 +1,6 @@
PV = "0.22"
PLUGIN_ARCHIVE ?= "${@bb.data.getVar('PLUGIN_NAME', d, 1).replace('-sync','')}"
-SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw"
+SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2"
S = "${WORKDIR}/libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}/"
-do_unpack2() {
- cd ${WORKDIR} && tar jxf libopensync-plugin-${PLUGIN_ARCHIVE}-${PV}.tar.bz2?format=raw
-}
-
-addtask unpack2 after do_unpack before do_patch
-
diff --git a/meta/packages/opensync/libopensync_0.22.bb b/meta/packages/opensync/libopensync_0.22.bb
index ed4ef740b..be4355894 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/"
DEPENDS = "sqlite3 libxml2 zlib glib-2.0"
-SRC_URI = "http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw"
+SRC_URI = "http://www.opensync.org/download/releases/0.22/libopensync-0.22.tar.bz2"
inherit autotools pkgconfig lib_package
@@ -13,9 +13,7 @@ LEAD_SONAME = "libopensync.so"
FILES_${PN} += " ${libdir}/opensync/formats/*.so"
FILES_${PN}-dbg += " ${libdir}/opensync/formats/.debug/*.so"
-require opensync-unpack.inc
-
do_stage() {
-autotools_stage_all
+ autotools_stage_all
}
diff --git a/meta/packages/opensync/libopensync_svn.bb b/meta/packages/opensync/libopensync_svn.bb
index 9d17684f3..a09cdd2a8 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 \
file://zlib.patch;patch=1 \
file://no-werror.patch;patch=1"
+DEFAULT_PREFERENCE = "-1"
+
inherit scons
S = "${WORKDIR}/trunk"
diff --git a/meta/packages/opensync/msynctool_0.22.bb b/meta/packages/opensync/msynctool_0.22.bb
index 018c227e3..694103c4d 100644
--- a/meta/packages/opensync/msynctool_0.22.bb
+++ b/meta/packages/opensync/msynctool_0.22.bb
@@ -1,9 +1,7 @@
-SRC_URI = "http://www.opensync.org/attachment/wiki/download/msynctool-0.22.tar.bz2?format=raw"
+SRC_URI = "http://www.opensync.org/download/releases/0.22/msynctool-0.22.tar.bz2"
LICENSE = "GPL"
DEPENDS = "libopensync"
HOMEPAGE = "http://www.opensync.org/"
inherit autotools pkgconfig
-
-require opensync-unpack.inc
diff --git a/meta/packages/opensync/msynctool_svn.bb b/meta/packages/opensync/msynctool_svn.bb
index 88cb8f4b5..31be2c9cb 100644
--- a/meta/packages/opensync/msynctool_svn.bb
+++ b/meta/packages/opensync/msynctool_svn.bb
@@ -3,7 +3,9 @@ DEPENDS = "libopensync"
HOMEPAGE = "http://www.opensync.org/"
PV = "0.22+svnr${SRCREV}"
+DEFAULT_PREFERENCE = "-1"
+
SRC_URI = "svn://svn.opensync.org/multisync;module=trunk;proto=http"
S = "${WORKDIR}/trunk"
-inherit autotools pkgconfig
+inherit autotools pkgconfig scons
diff --git a/meta/packages/opensync/opensync-unpack.inc b/meta/packages/opensync/opensync-unpack.inc
deleted file mode 100644
index d5443187b..000000000
--- a/meta/packages/opensync/opensync-unpack.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-do_unpack2() {
- cd ${WORKDIR} && tar jxf ${PN}-${PV}.tar.bz2?format=raw
-}
-
-addtask unpack2 after do_unpack before do_patch