[oe-commits] [meta-openembedded] 36/44: libmodbus: add support for the libmodbus development release

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master
in repository meta-openembedded.

commit 1eac35d508320257a63d49a661d3e3b7ba5c36e5
Author: Pascal Bach <pascal.bach at siemens.com>
AuthorDate: Wed Apr 13 17:00:54 2016 +0200

    libmodbus: add support for the libmodbus development release
    
    libmodbus has two release streams:
    - stable: which currently is 3.0.x and does only receive fixes
    - development: 3.1.x which receives new features and according to upstream is also very stable
    
    Some users require access to the newer features.
    So a recipe for the development branch but leave the stable branch the default.
    This is similar to what is done for the nginx recipe which also has two release streams.
    
    Signed-off-by: Pascal Bach <pascal.bach at siemens.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../libmodbus/{libmodbus_3.0.6.bb => libmodbus.inc}        |  5 +----
 meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb      | 14 +-------------
 meta-oe/recipes-extended/libmodbus/libmodbus_3.1.2.bb      |  7 +++++++
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb b/meta-oe/recipes-extended/libmodbus/libmodbus.inc
similarity index 65%
copy from meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
copy to meta-oe/recipes-extended/libmodbus/libmodbus.inc
index c5e6ae8..a01659a 100644
--- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus.inc
@@ -8,9 +8,6 @@ SECTION = "libs"
 LICENSE = "LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI = "http://libmodbus.org/site_media/build/${BP}.tar.gz"
+SRC_URI = "http://libmodbus.org/releases/${BP}.tar.gz"
 
 inherit autotools pkgconfig
-
-SRC_URI[md5sum] = "c80f88b6ca19cabc4ceffc195ca07771"
-SRC_URI[sha256sum] = "046d63f10f755e2160dc56ef681e5f5ad3862a57c1955fd82e0ce036b69471b6"
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
index c5e6ae8..b4d32fb 100644
--- a/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.0.6.bb
@@ -1,16 +1,4 @@
-SUMMARY = "A Modbus library"
-DESCRIPTION = "libmodbus is a C library designed to provide a fast and robust \
-implementation of the Modbus protocol. It runs on Linux, Mac OS X, FreeBSD, \
-QNX and Windows."
-HOMEPAGE = "http://www.libmodbus.org/"
-SECTION = "libs"
-
-LICENSE = "LGPLv2.1+"
-LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI = "http://libmodbus.org/site_media/build/${BP}.tar.gz"
-
-inherit autotools pkgconfig
+require libmodbus.inc
 
 SRC_URI[md5sum] = "c80f88b6ca19cabc4ceffc195ca07771"
 SRC_URI[sha256sum] = "046d63f10f755e2160dc56ef681e5f5ad3862a57c1955fd82e0ce036b69471b6"
diff --git a/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.2.bb b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.2.bb
new file mode 100644
index 0000000..6fcfc3a
--- /dev/null
+++ b/meta-oe/recipes-extended/libmodbus/libmodbus_3.1.2.bb
@@ -0,0 +1,7 @@
+require libmodbus.inc
+
+# Use the stable branch by default
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI[md5sum] = "dd4262f87ed835c4d1e560f8321a222c"
+SRC_URI[sha256sum] = "661e14f9dc904f3f1b034464ddaa5fd4b8472f8f5d1ea10a1148af85591b7ee9"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.