samba4: install to staging

PATCH New Gustavo Zacarias 3 participants 10 messages Mar 6, 2015 – Apr 3, 2015

lore

Share & tools

lore

Gustavo Zacarias

author

2015-03-06 12:50 UTC #0 lore raw

PATCH 1/6 samba4: install to staging

It's required for packages that need libsmbclient.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/samba4/samba4.mk | 5 +++++
 1 file changed, 5 insertions(+)

package/samba4/samba4.mk +5 -0

index 527d584..78d92ef 100644
@@ -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

Signature · 1 line

2.0.5

Gustavo Zacarias

author

2015-03-06 12:50 UTC #1 lore raw

PATCH 2/6 mpd: switch smb support to samba4

samba3 is deprecated upstream.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/mpd/Config.in | 7 +++++--
 package/mpd/mpd.mk    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

package/mpd/Config.in +5 -2

index 287ccf3..d077792 100644
@@ -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.

package/mpd/mpd.mk +1 -1

index 41f3564..b5adafd 100644
@@ -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

Signature · 1 line

2.0.5

Thomas Petazzoni

2015-04-03 12:32 UTC #2 lore raw

PATCH 2/6 mpd: switch smb support to samba4

Dear Gustavo Zacarias,

Quoted 7 lines · Gustavo Zacarias

samba3 is deprecated upstream.
Signed-off-by Gustavo Zacarias <[email protected]>
---
 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

Signature · 3 lines

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

Gustavo Zacarias

author

2015-03-06 12:50 UTC #3 lore raw

PATCH 3/6 kodi: switch smb support to samba4

In reply to Gustavo Zacarias

samba3 is deprecated upstream.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/kodi/Config.in | 7 +++++--
 package/kodi/kodi.mk   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

package/kodi/Config.in +5 -2

index 1bc8b15..48e624f 100644
@@ -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

package/kodi/kodi.mk +1 -1

index f40fc31..a975f70 100644
@@ -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

Signature · 1 line

2.0.5

Yann E. MORIN

2015-03-09 22:00 UTC #4 lore raw

PATCH 3/6 kodi: switch smb support to samba4

Gustavo, All,

On 2015-03-06 09:50 -0300, Gustavo Zacarias spake thusly:

Quoted 3 lines

samba3 is deprecated upstream.
Signed-off-by Gustavo Zacarias <[email protected]>

Tested-by "Yann E. MORIN" <[email protected]>

[run-time tested on RPI-2 and played video via a SMB share]

Acked-by "Yann E. MORIN" <[email protected]>

Regards,
Yann E. MORIN.

Quoted 45 lines

---
 package/kodi/Config.in | 7 +++++--
 package/kodi/kodi.mk   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

package/kodi/Config.in +5 -2

index 1bc8b15..48e624f 100644
@@ -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

package/kodi/kodi.mk +1 -1

index f40fc31..a975f70 100644
@@ -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

Signature · 6 lines

2.0.5

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Signature · 6 lines

.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

Gustavo Zacarias

author

2015-03-06 12:50 UTC #5 lore raw

PATCH 4/6 gvfs: switch smb support to samba4

In reply to Gustavo Zacarias

samba3 is deprecated upstream.

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/gvfs/gvfs.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

package/gvfs/gvfs.mk +3 -3

index d3f5a4f..4242e80 100644
@@ -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

Signature · 1 line

2.0.5

Gustavo Zacarias

author

2015-03-06 12:50 UTC #6 lore raw

PATCH 5/6 samba: deprecate package due to EOL

In reply to 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 <[email protected]>

---
 package/samba/Config.in | 2 ++
 1 file changed, 2 insertions(+)

package/samba/Config.in +2 -0

index 9d04851..7ff8428 100644
@@ -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

Signature · 1 line

2.0.5

Gustavo Zacarias

author

2015-03-06 12:50 UTC #7 lore raw

PATCH 6/6 gvfs: add hash

In reply to Gustavo Zacarias

Signed-off-by Gustavo Zacarias <[email protected]>

---
 package/gvfs/gvfs.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/gvfs/gvfs.hash

package/gvfs/gvfs.hash new file +2 -0

new file mode 100644
index 0000000..df21790
@@ -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

Signature · 1 line

2.0.5

Thomas Petazzoni

Applied

2015-03-06 22:51 UTC #8 lore raw

PATCH 6/6 gvfs: add hash

Dear Gustavo Zacarias,

Quoted 5 lines · Gustavo Zacarias

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/gvfs/gvfs.hash | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 package/gvfs/gvfs.hash

Applied, thanks!

Thomas

Signature · 3 lines

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

Thomas Petazzoni

Applied

2015-03-06 22:50 UTC #9 lore raw

PATCH 1/6 samba4: install to staging

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 6 lines · Gustavo Zacarias

It's required for packages that need libsmbclient.
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/samba4/samba4.mk | 5 +++++
 1 file changed, 5 insertions(+)

Applied, thanks.

Thomas

Signature · 3 lines

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