Signed-off-by: Khem Raj <raj.khem@gmail.com>

libssh_0.2.bb: New recipe
libssh_0.11.bb: Reduce priority so that libssh_0.2.bb can be picked up.

  * Some how oe_runmake called with make -j4 did not work for me thats
    why I used non parallel make.

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5d3e628..ed910b6 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -13142,6 +13142,10 @@ sha256=8b4ebd22dcfa7511109c2f6fa9e304c2ef3acaa492d55423cdf9a6f54a2fdb22
 md5=ad703c4702646c83ca4fcace92c220d3
 sha256=94ca32ac10615a7c0ba19180e67f2e40e2bfa4cc8de6ceb2a3a54d2dd83141cb
 
+[http://www.0xbadc0de.be/libssh/libssh-0.2.tgz]
+md5=8a76c03579a3e27046e6bafe88ffd171
+sha256=46c3831fd563c54283ebef56e2cb11c27f47b1be9f6cb44f1465897dd7aea5ff
+
 [http://snowball.tartarus.org/dist/libstemmer_c.tgz]
 md5=8358a9ddaaffeeca7cb00725770f7cdb
 sha256=f3e93a41ad76e91f08e3115fa5065df8b69fd3f2dbdd9e982ae890b892ac6477

diff --git a/packages/libssh/files/libssh_libdir_fix.patch b/packages/libssh/files/libssh_libdir_fix.patch
new file mode 100644 (file)
index 0000000..a9fcce7
--- /dev/null
+++ b/packages/libssh/files/libssh_libdir_fix.patch
@@ -0,0 +1,13 @@
+diff -NurpP --minimal libssh-0.2/libssh/Makefile.in libssh-0.2-libdir/libssh/Makefile.in
+--- libssh-0.2/libssh/Makefile.in      2006-12-29 23:03:59.000000000 +0800
++++ libssh-0.2-libdir/libssh/Makefile.in       2008-10-13 10:04:13.000000000 +0800
+@@ -15,7 +15,7 @@ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+ incldir= $(prefix)/include
+ infodir = $(prefix)/info
+-libdir = $(prefix)/lib/
++libdir = $(prefix)/lib
+ mandir = $(prefix)/man/man1
+ 
+ CC = @CC@
+

diff --git a/packages/libssh/libssh_0.11.bb b/packages/libssh/libssh_0.11.bb
index ab6949f..833567e 100644 (file)
--- a/packages/libssh/libssh_0.11.bb
+++ b/packages/libssh/libssh_0.11.bb
@@ -6,6 +6,8 @@ includes SFTP support, and a sample SSH client is provided."
 DEPENDS = "openssl"
 LICENSE = "LGPL"
 
+DEFAULT_PREFERENCE="-1"
+
 SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz"
 
 inherit autotools

diff --git a/packages/libssh/libssh_0.2.bb b/packages/libssh/libssh_0.2.bb
new file mode 100644 (file)
index 0000000..b776094
--- /dev/null
+++ b/packages/libssh/libssh_0.2.bb
@@ -0,0 +1,28 @@
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "The SSH library is a C library to authenticate in a \
+simple manner to one or more SSH servers. The goal of this project \
+is to provide a library much simpler to use than OpenSSHs one. It \
+includes SFTP support, and a sample SSH client is provided."
+
+HOMEPAGE = "http://0xbadc0de.be/wiki/libssh:libssh"
+LICENSE = "LGPL"
+SECTION = "libs"
+DEPENDS = "openssl"
+SRC_URI = "http://www.0xbadc0de.be/libssh/libssh-${PV}.tgz \
+          file://libssh_libdir_fix.patch;patch=1 \
+         "
+inherit autotools
+
+EXTRA_OECONF = "--cache-file=${S}/config.cache"
+do_compile () {
+       oenote make "$@"
+       make "$@" || die "oe_runmake failed"
+}
+do_stage () {
+       install -d ${STAGING_INCDIR}/libssh
+       for i in crypto.h libssh.h sftp.h ssh2.h; do
+               install -m 0644 ${S}/include/libssh/$i ${STAGING_INCDIR}/libssh/
+       done
+       oe_libinstall -so -C libssh libssh ${STAGING_LIBDIR}
+}