[Buildroot] [git commit master 1/1] sshfs: select openssh instead of depending

[Buildroot] [git commit master 1/1] sshfs: select openssh instead of depending

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=ae2aa63dafca83259c4e113c9934bd5fef715881
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Select openssh in Config.in rather than depend on it.
Otherwise the option is missing without an obvious reason.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/sshfs/Config.in |    2 +-
 package/sshfs/sshfs.mk  |   10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 61d9bf3..1d9f759 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_SSHFS
 	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
 	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	depends on BR2_PACKAGE_OPENSSH
+	select BR2_PACKAGE_OPENSSH
 	depends on BR2_LARGEFILE
 	depends on BR2_USE_WCHAR # glib2
 	help
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index 09f1e93..816f77a 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -4,13 +4,9 @@
 #
 #############################################################
 
-SSHFS_VERSION:=2.2
-SSHFS_SOURCE:=sshfs-fuse-$(SSHFS_VERSION).tar.gz
-SSHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)/sshfs-fuse
-SSHFS_AUTORECONF:=NO
-SSHFS_INSTALL_STAGING:=NO
-SSHFS_INSTALL_TARGET:=YES
-
+SSHFS_VERSION = 2.2
+SSHFS_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)/sshfs-fuse
+SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
 SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 
 $(eval $(call AUTOTARGETS,package,sshfs))
-- 
1.7.3.4

[Buildroot] [git commit master 1/1] sshfs: select openssh instead of depending

[Thomas Petazzoni]

Hello,

Again not related to this change, but spotted during review.

On Mon, 17 Jan 2011 21:23:00 +0100
Peter Korsgaard <jacmet@sunsite.dk> wrote:

If we:

>  	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
> +	select BR2_PACKAGE_OPENSSH

Then presumably we should:

>  SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)

SSHFS_DEPENDENCIES = \
	libglib2 libfuse openssh \
	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
	$(if $(BR2_ENABLE_LOCALE),,libiconv)

(i.e add openssh and libiconv in the dependencies)

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [git commit master 1/1] sshfs: select openssh instead of depending

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

Hi,

 Thomas> Then presumably we should:

 >> SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)

 Thomas> SSHFS_DEPENDENCIES = \
 Thomas> 	libglib2 libfuse openssh \
 Thomas> 	$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl)
 Thomas> 	$(if $(BR2_ENABLE_LOCALE),,libiconv)

 Thomas> (i.e add openssh and libiconv in the dependencies)

Ahh yes, will fix - Thanks.

-- 
Bye, Peter Korsgaard