[Buildroot] [PATCH 1/6] samba4: install to staging

[Buildroot] [PATCH 1/6] samba4: install to staging

[Gustavo Zacarias]

It's required for packages that need libsmbclient.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/samba4/samba4.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk
index 527d584..78d92ef 100644
--- a/package/samba4/samba4.mk
+++ b/package/samba4/samba4.mk
@@ -7,6 +7,7 @@
 SAMBA4_VERSION = 4.2.0
 SAMBA4_SITE = http://ftp.samba.org/pub/samba
 SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz
+SAMBA4_INSTALL_STAGING = YES
 SAMBA4_LICENSE = GPLv3+
 SAMBA4_LICENSE_FILES = COPYING
 SAMBA4_DEPENDENCIES = host-e2fsprogs host-heimdal e2fsprogs popt python zlib \
@@ -113,6 +114,10 @@ define SAMBA4_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
+define SAMBA4_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install
+endef
+
 define SAMBA4_INSTALL_TARGET_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 endef
-- 
2.0.5

[Buildroot] [PATCH 2/6] mpd: switch smb support to samba4

[Gustavo Zacarias]

samba3 is deprecated upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/mpd/Config.in | 7 +++++--
 package/mpd/mpd.mk    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 287ccf3..d077792 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -202,11 +202,14 @@ config BR2_PACKAGE_MPD_LIBNFS
 comment "nfs support needs a toolchain w/ RPC"
 	depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC
 
+comment "samba support needs an (e)glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
+
 config BR2_PACKAGE_MPD_LIBSMBCLIENT
 	bool "samba"
 	depends on !BR2_nios2 # samba
-	select BR2_PACKAGE_SAMBA
-	select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_SAMBA4
 	help
 	  Enable Samba support.
 
diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk
index 41f3564..b5adafd 100644
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@@ -114,7 +114,7 @@ MPD_CONF_OPTS += --disable-nfs
 endif
 
 ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y)
-MPD_DEPENDENCIES += samba
+MPD_DEPENDENCIES += samba4
 MPD_CONF_OPTS += --enable-smbclient
 else
 MPD_CONF_OPTS += --disable-smbclient
-- 
2.0.5

[Buildroot] [PATCH 2/6] mpd: switch smb support to samba4

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Fri,  6 Mar 2015 09:50:30 -0300, Gustavo Zacarias wrote:
> samba3 is deprecated upstream.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/mpd/Config.in | 7 +++++--
>  package/mpd/mpd.mk    | 2 +-
>  2 files changed, 6 insertions(+), 3 deletions(-)

Patches 2 to 5 applied. Patches 1 and 6 were already applied.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 3/6] kodi: switch smb support to samba4

[Gustavo Zacarias]

samba3 is deprecated upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/kodi/Config.in | 7 +++++--
 package/kodi/kodi.mk   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 1bc8b15..48e624f 100644
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -203,10 +203,13 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY
 comment "shairport support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
+comment "samba support needs an (e)glibc toolchain"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC
+
 config BR2_PACKAGE_KODI_LIBSMBCLIENT
 	bool "samba"
-	select BR2_PACKAGE_SAMBA
-	select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	select BR2_PACKAGE_SAMBA4
 	help
 	  Enable Samba support
 
diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
index f40fc31..a975f70 100644
--- a/package/kodi/kodi.mk
+++ b/package/kodi/kodi.mk
@@ -140,7 +140,7 @@ KODI_CONF_OPTS += --disable-webserver
 endif
 
 ifeq ($(BR2_PACKAGE_KODI_LIBSMBCLIENT),y)
-KODI_DEPENDENCIES += samba
+KODI_DEPENDENCIES += samba4
 KODI_CONF_OPTS += --enable-samba
 else
 KODI_CONF_OPTS += --disable-samba
-- 
2.0.5

[Buildroot] [PATCH 3/6] kodi: switch smb support to samba4

[Yann E. MORIN]

Gustavo, All,

On 2015-03-06 09:50 -0300, Gustavo Zacarias spake thusly:
> samba3 is deprecated upstream.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[run-time tested on RPI-2 and played video via a SMB share]
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/kodi/Config.in | 7 +++++--
>  package/kodi/kodi.mk   | 2 +-
>  2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/package/kodi/Config.in b/package/kodi/Config.in
> index 1bc8b15..48e624f 100644
> --- a/package/kodi/Config.in
> +++ b/package/kodi/Config.in
> @@ -203,10 +203,13 @@ config BR2_PACKAGE_KODI_LIBSHAIRPLAY
>  comment "shairport support needs a toolchain w/ dynamic library"
>  	depends on BR2_STATIC_LIBS
>  
> +comment "samba support needs an (e)glibc toolchain"
> +	depends on !BR2_TOOLCHAIN_USES_GLIBC
> +
>  config BR2_PACKAGE_KODI_LIBSMBCLIENT
>  	bool "samba"
> -	select BR2_PACKAGE_SAMBA
> -	select BR2_PACKAGE_SAMBA_LIBSMBCLIENT
> +	depends on BR2_TOOLCHAIN_USES_GLIBC
> +	select BR2_PACKAGE_SAMBA4
>  	help
>  	  Enable Samba support
>  
> diff --git a/package/kodi/kodi.mk b/package/kodi/kodi.mk
> index f40fc31..a975f70 100644
> --- a/package/kodi/kodi.mk
> +++ b/package/kodi/kodi.mk
> @@ -140,7 +140,7 @@ KODI_CONF_OPTS += --disable-webserver
>  endif
>  
>  ifeq ($(BR2_PACKAGE_KODI_LIBSMBCLIENT),y)
> -KODI_DEPENDENCIES += samba
> +KODI_DEPENDENCIES += samba4
>  KODI_CONF_OPTS += --enable-samba
>  else
>  KODI_CONF_OPTS += --disable-samba
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 4/6] gvfs: switch smb support to samba4

[Gustavo Zacarias]

samba3 is deprecated upstream.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/gvfs/gvfs.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/gvfs/gvfs.mk b/package/gvfs/gvfs.mk
index d3f5a4f..4242e80 100644
--- a/package/gvfs/gvfs.mk
+++ b/package/gvfs/gvfs.mk
@@ -58,11 +58,11 @@ else
 GVFS_CONF_OPTS += --disable-http
 endif
 
-ifeq ($(BR2_PACKAGE_SAMBA_LIBSMBCLIENT),y)
-GVFS_DEPENDENCIES += samba
+ifeq ($(BR2_PACKAGE_SAMBA4),y)
+GVFS_DEPENDENCIES += samba4
 GVFS_CONF_OPTS += \
 	--enable-samba \
-	--with-samba-includes=$(STAGING_DIR)/usr/include \
+	--with-samba-includes=$(STAGING_DIR)/usr/include/samba-4.0 \
 	--with-samba-libs=$(STAGING_DIR)/usr/lib \
 	ac_cv_lib_smbclient_smbc_option_get=yes
 else
-- 
2.0.5

[Buildroot] [PATCH 5/6] samba: deprecate package due to EOL

[Gustavo Zacarias]

Samba 3.6.x is now EOL, people should move to samba4.

See: https://www.samba.org/samba/history/samba-4.2.0.html

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/samba/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/samba/Config.in b/package/samba/Config.in
index 9d04851..7ff8428 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_SAMBA
 	bool "samba"
+	depends on BR2_DEPRECATED_SINCE_2015_05
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_nios2 # binary too large, relocations don't fit
@@ -15,6 +16,7 @@ config BR2_PACKAGE_SAMBA
 		so choose only the components you need.
 
 comment "samba needs a toolchain w/ threads"
+	depends on BR2_DEPRECATED_SINCE_2015_05
 	depends on BR2_USE_MMU
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
 
-- 
2.0.5

[Buildroot] [PATCH 6/6] gvfs: add hash

[Gustavo Zacarias]

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/gvfs/gvfs.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/gvfs/gvfs.hash

diff --git a/package/gvfs/gvfs.hash b/package/gvfs/gvfs.hash
new file mode 100644
index 0000000..df21790
--- /dev/null
+++ b/package/gvfs/gvfs.hash
@@ -0,0 +1,2 @@
+# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.16/gvfs-1.16.2.sha256sum
+sha256	6b0e62d27fe73844efb536689057b762fbce085984800c83395371306ec547f1	gvfs-1.16.2.tar.xz
-- 
2.0.5

[Buildroot] [PATCH 6/6] gvfs: add hash

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Fri,  6 Mar 2015 09:50:34 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/gvfs/gvfs.hash | 2 ++
>  1 file changed, 2 insertions(+)
>  create mode 100644 package/gvfs/gvfs.hash

Applied, thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/6] samba4: install to staging

[Thomas Petazzoni]

Dear Gustavo Zacarias,

On Fri,  6 Mar 2015 09:50:29 -0300, Gustavo Zacarias wrote:
> It's required for packages that need libsmbclient.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/samba4/samba4.mk | 5 +++++
>  1 file changed, 5 insertions(+)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com