let autobuild use --extra-python=/usr/bin/python3
Stefan Metzmacher
metze at samba.org
Tue Feb 2 12:16:32 UTC 2016
Hi,
I'm using --extra-python=/usr/bin/python3 for a while now
on my laptop.
I think it's time that we make sure we don't regress on this.
So here's are some patches which change autobuild to
use --extra-python=/usr/bin/python3 by default,
unless AUTOBUILD_NO_EXTRA_PYTHON=1 is set in the enviroment.
Please review and push:-)
Thanks!
metze
-------------- next part --------------
From 683459ba34b590d25a998d3f6d4ac571fd442386 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Tue, 2 Feb 2016 11:42:52 +0100
Subject: [PATCH 1/6] .travis.yml: do a sort -u on the installed packages
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 9d12665..6e9e7ca 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install --assume-yes screen git build-essential libacl1-dev libattr1-dev libblkid-dev libgnutls-dev libreadline-dev python-dev libpam0g-dev python-dnspython gdb pkg-config libpopt-dev libldap2-dev dnsutils libbsd-dev attr krb5-user docbook-xsl libcups2-dev acl bison debhelper docbook-xml docbook-xsl flex libaio-dev libbsd-dev libcap-dev libcups2-dev libncurses5-dev libpam0g-dev libpopt-dev libreadline-dev perl perl-modules libparse-yapp-perl pkg-config python-all-dev python-dnspython xsltproc zlib1g-dev autoconf
+ - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-all-dev python-dev python-dnspython screen xsltproc zlib1g-dev
script:
- git fetch --unshallow
--
1.9.1
From cffb9cae97f14d030a477a0826af5d7dd8adcd03 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Tue, 2 Feb 2016 13:06:06 +0100
Subject: [PATCH 2/6] .travis.yml: we require 'realpath' now
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 6e9e7ca..0fb20fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-all-dev python-dev python-dnspython screen xsltproc zlib1g-dev
+ - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-all-dev python-dev python-dnspython realpath screen xsltproc zlib1g-dev
script:
- git fetch --unshallow
--
1.9.1
From f5fc86acb7ff6571cf78ed7cdf2a10b88541d261 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Tue, 2 Feb 2016 11:46:00 +0100
Subject: [PATCH 3/6] .travis.yml: we don't require python-all-dev
python-dev is enough.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 0fb20fc..b7b56e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-all-dev python-dev python-dnspython realpath screen xsltproc zlib1g-dev
+ - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-dev python-dnspython realpath screen xsltproc zlib1g-dev
script:
- git fetch --unshallow
--
1.9.1
From ff6f1e8456270bffee714f57dcdeffe9dd5e31a6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Tue, 2 Feb 2016 11:46:56 +0100
Subject: [PATCH 4/6] .travis.yml: install python-crypto
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index b7b56e8..19f4887 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-dev python-dnspython realpath screen xsltproc zlib1g-dev
+ - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-crypto python-dev python-dnspython realpath screen xsltproc zlib1g-dev
script:
- git fetch --unshallow
--
1.9.1
From f95e704e75f518a0f8e9cb2aad0e1676744df415 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Tue, 2 Feb 2016 11:49:52 +0100
Subject: [PATCH 5/6] .travis.yml: install python3-{crypto,dev,dnspython}
autobuild will use --extra-python=/usr/bin/python3 in future.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
.travis.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.travis.yml b/.travis.yml
index 19f4887..b930cfe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ matrix:
before_install:
- sudo apt-get update -qq
- - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-crypto python-dev python-dnspython realpath screen xsltproc zlib1g-dev
+ - sudo apt-get install --assume-yes acl attr autoconf bison build-essential debhelper dnsutils docbook-xml docbook-xsl flex gdb git krb5-user libacl1-dev libaio-dev libattr1-dev libblkid-dev libbsd-dev libcap-dev libcups2-dev libgnutls-dev libldap2-dev libncurses5-dev libpam0g-dev libparse-yapp-perl libpopt-dev libreadline-dev perl perl-modules pkg-config python-crypto python-dev python-dnspython python3-crypto python3-dev python3-dnspython realpath screen xsltproc zlib1g-dev
script:
- git fetch --unshallow
--
1.9.1
From a6d55c1cefd4bdbd6c402f3691178deed5545e0f Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze at samba.org>
Date: Mon, 1 Feb 2016 12:55:34 +0100
Subject: [PATCH 6/6] script/autobuild.py: use --extra-python=/usr/bin/python3
by default
export AUTOBUILD_NO_EXTRA_PYTHON=1 can overwrite this if required.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
---
script/autobuild.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/script/autobuild.py b/script/autobuild.py
index 9f0d893..4cad920 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -40,15 +40,20 @@ builddirs = {
defaulttasks = [ "ctdb", "samba", "samba-xc", "samba-ctdb", "samba-libs", "samba-static", "ldb", "tdb", "talloc", "replace", "tevent", "pidl" ]
-samba_configure_params = " --picky-developer ${PREFIX} --with-profiling-data"
+samba_configure_params = " --picky-developer ${PREFIX} ${EXTRA_PYTHON} --with-profiling-data"
samba_libs_envvars = "PYTHONPATH=${PYTHON_PREFIX}/site-packages:$PYTHONPATH"
samba_libs_envvars += " PKG_CONFIG_PATH=$PKG_CONFIG_PATH:${PREFIX_DIR}/lib/pkgconfig"
samba_libs_envvars += " ADDITIONAL_CFLAGS='-Wmissing-prototypes'"
-samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX}"
+samba_libs_configure_base = samba_libs_envvars + " ./configure --abi-check --enable-debug --picky-developer -C ${PREFIX} ${EXTRA_PYTHON}"
samba_libs_configure_libs = samba_libs_configure_base + " --bundled-libraries=NONE"
samba_libs_configure_samba = samba_libs_configure_base + " --bundled-libraries=!talloc,!pytalloc-util,!tdb,!pytdb,!ldb,!pyldb,!pyldb-util,!tevent,!pytevent"
+if os.environ.get("AUTOBUILD_NO_EXTRA_PYTHON", "0") == "1":
+ extra_python = ""
+else:
+ extra_python = "--extra-python=/usr/bin/python3"
+
tasks = {
"ctdb" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
("configure", "./configure ${PREFIX}", "text/plain"),
@@ -142,7 +147,7 @@ tasks = {
"ldb" : [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("install", "make install", "text/plain"),
("test", "make test", "text/plain"),
@@ -152,7 +157,7 @@ tasks = {
"tdb" : [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("install", "make install", "text/plain"),
("test", "make test", "text/plain"),
@@ -162,7 +167,7 @@ tasks = {
"talloc" : [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("install", "make install", "text/plain"),
("test", "make test", "text/plain"),
@@ -182,7 +187,7 @@ tasks = {
"tevent" : [
("random-sleep", "../../script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure --enable-developer -C ${PREFIX}", "text/plain"),
+ ("configure", "./configure --enable-developer -C ${PREFIX} ${EXTRA_PYTHON}", "text/plain"),
("make", "make", "text/plain"),
("install", "make install", "text/plain"),
("test", "make test", "text/plain"),
@@ -259,6 +264,7 @@ class builder(object):
(self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next]
self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(standard_lib=1, prefix=self.prefix))
self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix)
+ self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "%s" % extra_python)
self.cmd = self.cmd.replace("${PREFIX_DIR}", "%s" % self.prefix)
# if self.output_mime_type == "text/x-subunit":
# self.cmd += " | %s --immediate" % (os.path.join(os.path.dirname(__file__), "selftest/format-subunit"))
--
1.9.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: OpenPGP digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20160202/4281751c/signature.sig>
More information about the samba-technical
mailing list