From 51060f88e7e583d78e1f246327d7d107a11467b0 Mon Sep 17 00:00:00 2001
From: Yi Zhao <yi.zhao@windriver.com>
Date: Fri, 21 Aug 2015 13:32:24 +0800
Subject: libssh: upgrade 0.6.4 -> 0.7.1

Set the correct LIB_SUFFIX to fix QA issue for multilib:
ERROR: QA Issue: libssh: Files/directories were installed but not shipped in any package:
  /usr/lib
  /usr/lib/libssh.so
  /usr/lib/libssh_threads.so.4.5.0
  /usr/lib/libssh.so.4
  /usr/lib/libssh_threads.so.4
  /usr/lib/libssh_threads.so
  [snip]
Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install.  [installed-vs-shipped]

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-oe/recipes-support/libssh/libssh_0.7.1.bb | 33 +++++++++++++++++++++++++
 meta-oe/recipes-support/libssh/libssh_git.bb   | 34 --------------------------
 2 files changed, 33 insertions(+), 34 deletions(-)
 create mode 100644 meta-oe/recipes-support/libssh/libssh_0.7.1.bb
 delete 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.7.1.bb b/meta-oe/recipes-support/libssh/libssh_0.7.1.bb
new file mode 100644
index 000000000..371e1abbb
--- /dev/null
+++ b/meta-oe/recipes-support/libssh/libssh_0.7.1.bb
@@ -0,0 +1,33 @@
+SUMMARY = "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;branch=v0-7"
+SRCREV = "053f72c671a83b32238dc01b56a66752fb15b7ec"
+S = "${WORKDIR}/git"
+
+EXTRA_OECMAKE = " \
+    -DWITH_GCRYPT=1 \
+    -DWITH_PCAP=1 \
+    -DWITH_SFTP=1 \
+    -DWITH_ZLIB=1 \
+    -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \
+    "
+
+PACKAGECONFIG ??=""
+PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
+
+inherit cmake
+
+do_configure_prepend () {
+    # Disable building of examples
+    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
+        || bbfatal "Failed to disable examples"
+}
+
+FILES_${PN}-dev += "${libdir}/cmake"
diff --git a/meta-oe/recipes-support/libssh/libssh_git.bb b/meta-oe/recipes-support/libssh/libssh_git.bb
deleted file mode 100644
index 47fb39a5b..000000000
--- a/meta-oe/recipes-support/libssh/libssh_git.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "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;branch=v0-6"
-SRCREV = "3880a8ed80a4b1e2c052bd62f328bba2f869d5ae"
-S = "${WORKDIR}/git"
-
-PV = "0.6.4+git${SRCPV}"
-
-EXTRA_OECMAKE = " \
-    -DWITH_GCRYPT=1 \
-    -DWITH_PCAP=1 \
-    -DWITH_SFTP=1 \
-    -DWITH_ZLIB=1 \
-    "
-
-PACKAGECONFIG ??=""
-PACKAGECONFIG[gssapi] = "-DWITH_GSSAPI=1, -DWITH_GSSAPI=0, krb5, "
-
-inherit cmake
-
-do_configure_prepend () {
-    # Disable building of examples
-    sed -i -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' ${S}/CMakeLists.txt \
-        || bbfatal "Failed to disable examples"
-}
-
-FILES_${PN}-dev += "${libdir}/cmake"
-- 
cgit v1.2.3-54-g00ecf