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: [PATCH] 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>
---
 .../libssh/{libssh_git.bb => libssh_0.7.1.bb}              | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-support/libssh/{libssh_git.bb => libssh_0.7.1.bb} (79%)

diff --git a/meta-oe/recipes-support/libssh/libssh_git.bb b/meta-oe/recipes-support/libssh/libssh_0.7.1.bb
similarity index 79%
rename from meta-oe/recipes-support/libssh/libssh_git.bb
rename to meta-oe/recipes-support/libssh/libssh_0.7.1.bb
index 47fb39a5b6..371e1abbb7 100644
--- a/meta-oe/recipes-support/libssh/libssh_git.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.7.1.bb
@@ -7,17 +7,16 @@ 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"
+SRC_URI = "git://git.libssh.org/projects/libssh.git;branch=v0-7"
+SRCREV = "053f72c671a83b32238dc01b56a66752fb15b7ec"
 S = "${WORKDIR}/git"
 
-PV = "0.6.4+git${SRCPV}"
-
 EXTRA_OECMAKE = " \
     -DWITH_GCRYPT=1 \
     -DWITH_PCAP=1 \
     -DWITH_SFTP=1 \
     -DWITH_ZLIB=1 \
+    -DLIB_SUFFIX=${@d.getVar('baselib', True).replace('lib', '')} \
     "
 
 PACKAGECONFIG ??=""