Skip to contentSkip to conversation

package/samba4: needs host-python3

PATCH New Fabrice Fontaine 3 participants 6 messages Mar 8, 2020 – Mar 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/samba4: needs host-python3

host-python3 is a mandatory dependency since bump to version 4.10.0 and
https://gitlab.com/samba-team/devel/samba/-/commit/5ddff307b4af5c82d5064745f5bd2c33bd340ced
because buildtools/bin/waf shebang is set to "/usr/bin/env python3"

Fixes:
- http://autobuild.buildroot.org/results/2634eb7824beb34f485cf40670f6959515f008ad

---
 package/samba4/samba4.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
package/samba4/samba4.mk +4 -7
index 005296ea74..3048cb9a63 100644
@@ -11,7 +11,7 @@ SAMBA4_INSTALL_STAGING = YES
 SAMBA4_LICENSE = GPL-3.0+
 SAMBA4_LICENSE_FILES = COPYING
 SAMBA4_DEPENDENCIES = \
-	host-e2fsprogs host-heimdal host-nfs-utils \
+	host-e2fsprogs host-heimdal host-nfs-utils host-python3 \
 	cmocka e2fsprogs gnutls popt zlib \
 	$(if $(BR2_PACKAGE_LIBAIO),libaio) \
 	$(if $(BR2_PACKAGE_LIBCAP),libcap) \
@@ -25,14 +25,11 @@ SAMBA4_CONF_ENV = \
 	XSLTPROC=false \
 	WAF_NO_PREFORK=1
 
+SAMBA4_PYTHON = PYTHON="$(HOST_DIR)/bin/python3"
 ifeq ($(BR2_PACKAGE_PYTHON3),y)
-SAMBA4_PYTHON = \
-	PYTHON="$(HOST_DIR)/bin/python3" \
-	PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config"
-SAMBA4_DEPENDENCIES += host-python3 python3
+SAMBA4_PYTHON += PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python3-config"
+SAMBA4_DEPENDENCIES += python3
 else
-SAMBA4_PYTHON = PYTHON="$(HOST_DIR)/bin/python2"
-SAMBA4_DEPENDENCIES += host-python
 SAMBA4_CONF_OPTS += --disable-python
 endif
 
Signature · 1 line
2.25.0
#1 lore raw

PATCH 1/1 package/samba4: needs host-python3

Quoted 2 lines · On Sun, 8 Mar 2020 12:18:12 +0100 Fabrice Fontaine…

host-python3 is a mandatory dependency since bump to version 4.10.0 and
https://gitlab.com/samba-team/devel/samba/-/commit/5ddff307b4af5c82d5064745f5bd2c33bd340ced

This commit says:

""
Users wishing to use python2 to build need to specify PYTHON= to both ./configure and make
""

So it seems like Python 3.x is not necessary. Have you tried that?

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/samba4: needs host-python3

Dear Thomas,

Le dim. 8 mars 2020 ? 15:05, Thomas Petazzoni
<[email protected]> a ?crit :

Quoted 7 lines
Quoted 2 lines · On Sun, 8 Mar 2020 12:18:12 +0100 Fabrice Fontaine…

host-python3 is a mandatory dependency since bump to version 4.10.0 and
https://gitlab.com/samba-team/devel/samba/-/commit/5ddff307b4af5c82d5064745f5bd2c33bd340ced

Quoted 8 lines

This commit says:

""
Users wishing to use python2 to build need to specify PYTHON= to both ./configure and make
""

So it seems like Python 3.x is not necessary. Have you tried that?

I'm not an expert in waf but we were already setting PYTHON="$(HOST_DIR)/bin/python2" in SAMBA4_PYTHON. SAMBA4_PYTHON is then passed to configure in SAMBA4_CONFIGURE_CMDS and to make in SAMBA4_BUILD_CMDS.
This indeed allow the user to use python2 in configure and make but the waf script will still mandate than python3 is installed on the host.
It should be noted that this dependency is clearly stated in the following commit log:
https://gitlab.com/samba-team/devel/samba/-/commit/05791f40a6e78e628ec4ab2fb0e13b2c7fbb1b78.

Quoted 8 lines

Thanks,

Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Best Regards,

Fabrice

#3 lore raw

PATCH 1/1 package/samba4: needs host-python3

Quoted 10 lines · On Sun, 8 Mar 2020 15:56:11 +0100 Fabrice Fontaine…

I'm not an expert in waf but we were already setting PYTHON="$(HOST_DIR)/bin/python2" in SAMBA4_PYTHON. SAMBA4_PYTHON is then passed to configure in SAMBA4_CONFIGURE_CMDS and to make in SAMBA4_BUILD_CMDS.
This indeed allow the user to use python2 in configure and make but the waf script will still mandate than python3 is installed on the host.
It should be noted that this dependency is clearly stated in the following commit log:
https://gitlab.com/samba-team/devel/samba/-/commit/05791f40a6e78e628ec4ab2fb0e13b2c7fbb1b78.

Thanks for the additional explanation, I've applied to master.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#4 lore raw

PATCH 1/1 package/samba4: needs host-python3

In reply to Fabrice Fontaine
Quoted 11 lines · On Sun, 8 Mar 2020 12:18:12 +0100 Fabrice Fontaine…

host-python3 is a mandatory dependency since bump to version 4.10.0 and
https://gitlab.com/samba-team/devel/samba/-/commit/5ddff307b4af5c82d5064745f5bd2c33bd340ced
because buildtools/bin/waf shebang is set to "/usr/bin/env python3"

Fixes:
- http://autobuild.buildroot.org/results/2634eb7824beb34f485cf40670f6959515f008ad

---
 package/samba4/samba4.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 1/1 package/samba4: needs host-python3

In reply to Fabrice Fontaine
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Fabrice" == Fabrice Fontaine <[email protected]> writes:

host-python3 is a mandatory dependency since bump to version 4.10.0 and
https://gitlab.com/samba-team/devel/samba/-/commit/5ddff307b4af5c82d5064745f5bd2c33bd340ced
because buildtools/bin/waf shebang is set to "/usr/bin/env python3"

Fixes:
- http://autobuild.buildroot.org/results/2634eb7824beb34f485cf40670f6959515f008ad

Committed to 2020.02.x and 2019.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard