Add support for libssh2 in buildroot
cover Add support for libssh2 in buildroot
Adding support for libssh2 to buildroot to allow for its use with libcurl. By having libcurl use libssh2, features like SCP and SFTP become possible when using libcurl.
For more detailed information about options enabled with libssh2 in libcurl see the following website: http://curl.haxx.se/docs/features.html
Ryan Barnett (2):
libssh2: add support for new package libssh2
libcurl: add support for compiling with libssh2
package/Config.in | 1 + package/libcurl/libcurl.mk | 8 +++++++ package/libssh2/Config.in | 18 ++++++++++++++++ package/libssh2/libssh2.mk | 49 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+), 0 deletions(-) create mode 100644 package/libssh2/Config.in create mode 100644 package/libssh2/libssh2.mk
PATCH 1/2 libssh2: add support for new package libssh2
Adding new package - libssh2 - under
Target packages > Libraries > Crypto > libssh2
libssh2 is a client-side C library implementing the SSH2 protocol.
For more information on this package - see their website:
http://www.libssh2.org/
--- package/Config.in | 1 + package/libssh2/Config.in | 18 ++++++++++++++++ package/libssh2/libssh2.mk | 49 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 0 deletions(-) create mode 100644 package/libssh2/Config.in create mode 100644 package/libssh2/libssh2.mk
package/Config.in +1 -0
@@ -424,6 +424,7 @@ source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libsha1/Config.in" +source "package/libssh2/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/polarssl/Config.in"
package/libssh2/Config.in new file +18 -0
@@ -0,0 +1,18 @@ +config BR2_PACKAGE_LIBSSH2 + bool "libssh2" + help + libssh2 is a client-side C library implementing the SSH2 protocol + as defined by Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), + SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, + SECSH-DHGEX(04), and SECSH-NUMBERS(10) + + The package has support to use either OpenSSL or libgcrypt for + cryptographic operations. Please select one of these packages in + build configuration + + The package will default to selecting OpenSSL if neither libgcrypt + or OpenSSL are selected. Also if OpenSSL and libgcrypt are both present, + OpenSSL will be used over libgcrypt. + + http://www.libssh2.org/ +
package/libssh2/libssh2.mk new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH 1/2 libssh2: add support for new package libssh2
Hi Ryan,
Thank you for your patch. A few comments below. Care to fix and resubmit?
Quoted 7 lines · Ryan Barnett
Adding new package - libssh2 - under
Target packages > Libraries > Crypto > libssh2libssh2 is a client-side C library implementing the SSH2 protocol.
For more information on this package - see their website:
http://www.libssh2.org/
For new packages, we usually limit the commit message to:
libssh2: new package
The rest is obvious from the patch itself.
Quoted 33 lines
Signed-off-by Ryan Barnett <[email protected]>--- package/Config.in | 1 + package/libssh2/Config.in | 18 ++++++++++++++++ package/libssh2/libssh2.mk | 49 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 0 deletions(-)create mode 100644 package/libssh2/Config.in
create mode 100644package/libssh2/libssh2.mkpackage/Config.in +1
-0@@ -424,6 +424,7 @@ source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libsha1/Config.in" +source "package/libssh2/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/polarssl/Config.in"package/libssh2/Config.in new file +5
-0@@ -0,0 +1,18 @@ +config BR2_PACKAGE_LIBSSH2 + bool "libssh2" + help + libssh2 is a client-side C library implementing the SSH2 protocol + as defined by Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25),
package/libssh2/Config.in line 15
Quoted 10 lines
package/libssh2/Config.in new file +10
-0+ SECSH-CONNECTION(23), SECSH-ARCH(20), SECSH-FILEXFER(06)*, + SECSH-DHGEX(04), and SECSH-NUMBERS(10) + + The package has support to use either OpenSSL or libgcrypt for + cryptographic operations. Please select one of these packages in + build configuration + + The package will default to selecting OpenSSL if neither libgcrypt + or OpenSSL are selected. Also if OpenSSL and libgcrypt are both present, + OpenSSL will be used over libgcrypt.
We don't usually write all these details. Something like
This package uses either OpenSSL or libgcrypt for cryptographic operations.
Also, you should select the appropriate package:
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
However, I would rather default to libgcrypt, which is much smaller
than openssl.
Quoted 11 lines
package/libssh2/Config.in new file +3
-0+ + http://www.libssh2.org/ +package/libssh2/libssh2.mk new file +2
-0@@ -0,0 +1,49 @@ +############################################################# +#
package/libssh2/libssh2.mk line 12
Quoted 10 lines
package/libssh2/libssh2.mk new file +10
-0+# libssh2 +# +############################################################# + +LIBSSH2_VERSION = 1.4.3 +LIBSSH2_SITE = http://www.libssh2.org/download/ +LIBSSH2_LICENSE = BSD +LIBSSH2_LICENSE_FILES = COPYING +LIBSSH2_INSTALL_STAGING = YES +LIBSSH2_CONF_OPT = --disable-examples-buildg
buildg?
package/libssh2/libssh2.mk line 19
Quoted 7 lines
package/libssh2/libssh2.mk new file +7
-0+ +# libssh2 must use either libgcrypt or OpenSSL - OpenSSL will take precedence over libgcrypt +# However, if neither is selected, OpenSSL will be added to the build +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBSSH2_DEPENDENCIES += openssl +LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
With the select in the Config.in, you can be sure that one of them is
selected so no second condition is needed.
package/libssh2/libssh2.mk line 30
Quoted 11 lines
package/libssh2/libssh2.mk new file +11
-0+LIBSSH2_DEPENDENCIES += libgcrypt +LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl +else +LIBSSH2_DEPENDENCIES += openssl +LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt +endif + +# Remove Documentation +ifneq ($(BR2_HAVE_DOCUMENTATION),y) +define LIBSSH2_TARGET_REMOVE_DOCUMENTATION + rm -f $(TARGET_DIR)/usr/share/man/man3/libssh2*
This isn't needed, target-finalize will do that.
Quoted 5 lines
package/libssh2/libssh2.mk new file +5
-0+endef +LIBSSH2_POST_INSTALL_TARGET_HOOKS += LIBSSH2_TARGET_REMOVE_DOCUMENTATION +endif + +# Remove unneeded files from target
package/libssh2/libssh2.mk line 45
Quoted 10 lines
package/libssh2/libssh2.mk new file +10
-0+LIBSSH2_UNNEEDED_FILES = \ + usr/include/libssh2.h \ + usr/include/libssh2_publickey.h \ + usr/include/libssh2_sftp.h \ + usr/lib/pkgconfig/libssh2.pc \ + usr/lib/libssh2.la \ + usr/lib/libssh2.a + +define LIBSSH2_TARGET_REMOVE_UNNEEDED_FILES + rm -rf $(addprefix $(TARGET_DIR)/, $(LIBSSH2_UNNEEDED_FILES))
Same here.
Otherwise looks good, but I haven't tested.
Regards,
Arnout
Quoted 5 lines
package/libssh2/libssh2.mk new file +4
-0+endef +LIBSSH2_POST_INSTALL_TARGET_HOOKS += LIBSSH2_TARGET_REMOVE_UNNEEDED_FILES + +$(eval $(autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/2 libssh2: add support for new package libssh2
Arnout -
Sure I can these fixes should be easy to implement. I guess I've been working with an old version of buildroot and didn't realize that the "target finalize" step will do this. I should be able to fix this up in the next hour or so.
Thanks,
-Ryan
Ryan J Barnett / Software Engineer / Platform SW MS 137-157, 855 35th St NE, Cedar Rapids, IA, 52498-3161, US
Phone: 319-263-3880 / VPN: 263-3880
rjbarnet at rockwellcollins.com www.rockwellcollins.com
From: Arnout Vandecappelle <[email protected]> To: Ryan Barnett <[email protected]>
Date: 08/29/2013 04:32 PM Subject: Re: [Buildroot] [PATCH 1/2] libssh2: add support for new
package libssh2
Hi Ryan,
Thank you for your patch. A few comments below. Care to fix and
resubmit?
Quoted 7 lines · Ryan Barnett
Adding new package - libssh2 - under
Target packages > Libraries > Crypto > libssh2libssh2 is a client-side C library implementing the SSH2 protocol.
For more information on this package - see their website:
http://www.libssh2.org/
For new packages, we usually limit the commit message to:
libssh2: new package
The rest is obvious from the patch itself.
Quoted 6 lines
Signed-off-by Ryan Barnett <[email protected]>--- package/Config.in | 1 + package/libssh2/Config.in | 18 ++++++++++++++++ package/libssh2/libssh2.mk | 49
++++++++++++++++++++++++++++++++++++++++++++
Quoted 22 lines
3 files changed, 68 insertions(+), 0 deletions(-)create mode 100644 package/libssh2/Config.in
create mode 100644package/libssh2/libssh2.mkpackage/Config.in +1
-0@@ -424,6 +424,7 @@ source "package/libmcrypt/Config.in" source "package/libmhash/Config.in" source "package/libnss/Config.in" source "package/libsha1/Config.in" +source "package/libssh2/Config.in" source "package/nettle/Config.in" source "package/openssl/Config.in" source "package/polarssl/Config.in"package/libssh2/Config.in new file +0
-0
package/libssh2/Config.in line 4
Quoted 4 lines
package/libssh2/Config.in new file +4
-0@@ -0,0 +1,18 @@ +config BR2_PACKAGE_LIBSSH2 + bool "libssh2" + help + libssh2 is a client-side C library implementing the
SSH2 protocol
package/libssh2/Config.in line 5
Quoted 1 line
package/libssh2/Config.in new file +1
-0+ as defined by Internet Drafts: SECSH-TRANS(22),
SECSH-USERAUTH(25),
package/libssh2/Config.in line 6
Quoted 1 line
package/libssh2/Config.in new file +1
-0+ SECSH-CONNECTION(23), SECSH-ARCH(20),
SECSH-FILEXFER(06)*,
package/libssh2/Config.in
Quoted 3 lines
package/libssh2/Config.in new file +3
-0+ SECSH-DHGEX(04), and SECSH-NUMBERS(10) + + The package has support to use either OpenSSL or
libgcrypt for
package/libssh2/Config.in line 10
Quoted 1 line
package/libssh2/Config.in new file +1
-0+ cryptographic operations. Please select one of these
packages in
package/libssh2/Config.in
Quoted 3 lines
package/libssh2/Config.in new file +3
-0+ build configuration + + The package will default to selecting OpenSSL if
neither libgcrypt
package/libssh2/Config.in line 14
Quoted 1 line
package/libssh2/Config.in new file +1
-0+ or OpenSSL are selected. Also if OpenSSL and libgcrypt
are both present,
package/libssh2/Config.in line 15
Quoted 1 line
package/libssh2/Config.in new file +1
-0+ OpenSSL will be used over libgcrypt.
We don't usually write all these details. Something like
This package uses either OpenSSL or libgcrypt for
cryptographic
operations.
Also, you should select the appropriate package:
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT
However, I would rather default to libgcrypt, which is much smaller
than openssl.
Quoted 11 lines
package/libssh2/Config.in new file +3
-0+ + http://www.libssh2.org/ +package/libssh2/libssh2.mk new file +2
-0@@ -0,0 +1,49 @@ +############################################################# +#
package/libssh2/libssh2.mk line 12
Quoted 10 lines
package/libssh2/libssh2.mk new file +10
-0+# libssh2 +# +############################################################# + +LIBSSH2_VERSION = 1.4.3 +LIBSSH2_SITE = http://www.libssh2.org/download/ +LIBSSH2_LICENSE = BSD +LIBSSH2_LICENSE_FILES = COPYING +LIBSSH2_INSTALL_STAGING = YES +LIBSSH2_CONF_OPT = --disable-examples-buildg
buildg?
package/libssh2/libssh2.mk line 14
Quoted 2 lines
package/libssh2/libssh2.mk new file +2
-0+ +# libssh2 must use either libgcrypt or OpenSSL - OpenSSL will take
precedence over libgcrypt
package/libssh2/libssh2.mk line 19
Quoted 5 lines
package/libssh2/libssh2.mk new file +5
-0+# However, if neither is selected, OpenSSL will be added to the build +ifeq ($(BR2_PACKAGE_OPENSSL),y) +LIBSSH2_DEPENDENCIES += openssl +LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt +else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
With the select in the Config.in, you can be sure that one of them is
selected so no second condition is needed.
package/libssh2/libssh2.mk line 30
Quoted 11 lines
package/libssh2/libssh2.mk new file +11
-0+LIBSSH2_DEPENDENCIES += libgcrypt +LIBSSH2_CONF_OPT += --with-libgcrypt --without-openssl +else +LIBSSH2_DEPENDENCIES += openssl +LIBSSH2_CONF_OPT += --with-openssl --without-libgcrypt +endif + +# Remove Documentation +ifneq ($(BR2_HAVE_DOCUMENTATION),y) +define LIBSSH2_TARGET_REMOVE_DOCUMENTATION + rm -f $(TARGET_DIR)/usr/share/man/man3/libssh2*
This isn't needed, target-finalize will do that.
package/libssh2/libssh2.mk line 32
Quoted 2 lines
package/libssh2/libssh2.mk new file +2
-0+endef +LIBSSH2_POST_INSTALL_TARGET_HOOKS +=
LIBSSH2_TARGET_REMOVE_DOCUMENTATION
package/libssh2/libssh2.mk
Quoted 13 lines
package/libssh2/libssh2.mk new file +13
-0+endif + +# Remove unneeded files from target +LIBSSH2_UNNEEDED_FILES = \ + usr/include/libssh2.h \ + usr/include/libssh2_publickey.h \ + usr/include/libssh2_sftp.h \ + usr/lib/pkgconfig/libssh2.pc \ + usr/lib/libssh2.la \ + usr/lib/libssh2.a + +define LIBSSH2_TARGET_REMOVE_UNNEEDED_FILES + rm -rf $(addprefix $(TARGET_DIR)/,
$(LIBSSH2_UNNEEDED_FILES))
Same here.
Otherwise looks good, but I haven't tested.
Regards,
Arnout
package/libssh2/libssh2.mk line 47
Quoted 2 lines
package/libssh2/libssh2.mk new file +2
-0+endef +LIBSSH2_POST_INSTALL_TARGET_HOOKS +=
LIBSSH2_TARGET_REMOVE_UNNEEDED_FILES
Quoted 3 lines
package/libssh2/libssh2.mk new file +2
-0+ +$(eval $(autotools-package))
Signature · 18 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130829/aec8c20e/attachment-0001.html> -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: image/gif Size: 2004 bytes Desc: not available URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20130829/aec8c20e/attachment-0001.gif>
PATCH 2/2 libcurl: add support for compiling with libssh2
In reply to Ryan BarnettAdding configuration options that if libssh2 is selected, compile libcurl with --with-ssh config flag.
--- package/libcurl/libcurl.mk | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
package/libcurl/libcurl.mk +8 -0
@@ -34,6 +34,14 @@ else LIBCURL_CONF_OPT += --without-ssl endif +# Configure curl to support libssh2 +ifeq ($(BR2_PACKAGE_LIBSSH2),y) +LIBCURL_DEPENDENCIES += libssh2 +LIBCURL_CONF_OPT += --with-libssh2 +else +LIBCURL_CONF_OPT += --without-libssh2 +endif + define LIBCURL_FIX_DOT_PC printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in endef
Signature · 1 line
1.7.1