From 398e7f75bd0f55a7c76c0de627cfda16e82165fa Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 1 Jan 2014 13:26:11 +0100
Subject: libssh: Fix branch param and set PV in recipe

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/libssh/libssh_0.5.5.bb | 30 -------------------------
 meta-oe/recipes-support/libssh/libssh_git.bb   | 31 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 30 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libssh/libssh_0.5.5.bb
 create mode 100644 meta-oe/recipes-support/libssh/libssh_git.bb

(limited to 'meta-oe/recipes-support/libssh')

diff --git a/meta-oe/recipes-support/libssh/libssh_0.5.5.bb b/meta-oe/recipes-support/libssh/libssh_0.5.5.bb
deleted file mode 100644
index fa251193dc..0000000000
--- a/meta-oe/recipes-support/libssh/libssh_0.5.5.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol"
-HOMEPAGE = "http://www.libssh.org"
-SECTION = "libs"
-
-DEPENDS = "zlib openssl libgcrypt"
-
-LICENSE = "LGPLv2.1"
-LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
-
-SRC_URI = "git://git.libssh.org/projects/libssh.git"
-SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db"
-S = "${WORKDIR}/git"
-
-OECMAKE_BUILDPATH = "${S}/build"
-OECMAKE_SOURCEPATH = "${S}"
-EXTRA_OECMAKE = " \
-    -DWITH_GCRYPT=1 \
-    -DWITH_PCAP=1 \
-    -DWITH_SFTP=1 \
-    -DWITH_ZLIB=1 \
-    "
-EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
-
-inherit cmake
-
-do_configure_prepend () {
-    # Disable building of examples
-    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt \
-        || bb_fatal "Failed to disable examples"
-}
diff --git a/meta-oe/recipes-support/libssh/libssh_git.bb b/meta-oe/recipes-support/libssh/libssh_git.bb
new file mode 100644
index 0000000000..73b9ec1f4e
--- /dev/null
+++ b/meta-oe/recipes-support/libssh/libssh_git.bb
@@ -0,0 +1,31 @@
+DESCRIPTION = "Multiplatform C library implementing the SSHv2 and SSHv1 protocol"
+HOMEPAGE = "http://www.libssh.org"
+SECTION = "libs"
+
+DEPENDS = "zlib openssl libgcrypt"
+
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://COPYING;md5=388a4fb1dea8ceae0be78ba9b01fc139"
+
+PV = "0.5.5+gitr${SRCPV}"
+SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-5"
+SRCREV = "43914a5f07702fe292a968322d5ff2627e0431db"
+S = "${WORKDIR}/git"
+
+OECMAKE_BUILDPATH = "${S}/build"
+OECMAKE_SOURCEPATH = "${S}"
+EXTRA_OECMAKE = " \
+    -DWITH_GCRYPT=1 \
+    -DWITH_PCAP=1 \
+    -DWITH_SFTP=1 \
+    -DWITH_ZLIB=1 \
+    "
+EXTRA_OEMAKE = "-C ${OECMAKE_BUILDPATH}"
+
+inherit cmake
+
+do_configure_prepend () {
+    # Disable building of examples
+    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' CMakeLists.txt \
+        || bb_fatal "Failed to disable examples"
+}
-- 
cgit 1.2.3-korg