The branch, master has been updated via 6968ee4 script/autobuild.py: use --extra-python=/usr/bin/python3 by default via e86a845 .travis.yml: install python3-{crypto,dev,dnspython} via 312bf41 .travis.yml: install python-crypto via 4132d36 .travis.yml: we don't require python-all-dev via b040cba .travis.yml: we require 'realpath' now via 212468e .travis.yml: do a sort -u on the installed packages via 8adf470 ldb:ABI: add missing pyldb-util.py3-1.1.25.sigs from 8b765ac smbd: fix build with FAM support
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 6968ee4b3a1cf5ef7fef2d94b9278d902c443c7a Author: Stefan Metzmacher <me...@samba.org> Date: Mon Feb 1 12:55:34 2016 +0100 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 <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> Autobuild-User(master): Stefan Metzmacher <me...@samba.org> Autobuild-Date(master): Mon Feb 15 14:28:27 CET 2016 on sn-devel-144 commit e86a8451ed5be9ac55e95ddadee4825f16ce8945 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Feb 2 11:49:52 2016 +0100 .travis.yml: install python3-{crypto,dev,dnspython} autobuild will use --extra-python=/usr/bin/python3 in future. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 312bf416ad6a6db4f4342556bd6190d56c455660 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Feb 2 11:46:56 2016 +0100 .travis.yml: install python-crypto Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 4132d3648f8dc0ed2d4413cb4904330b26886706 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Feb 2 11:46:00 2016 +0100 .travis.yml: we don't require python-all-dev python-dev is enough. Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit b040cbaf5bc853e2e3edc7917cd9ec72a664ce71 Author: Stefan Metzmacher <me...@samba.org> Date: Tue Feb 2 13:06:06 2016 +0100 .travis.yml: we require 'realpath' now Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 212468e96714548ec9d4186033396713632e51cf Author: Stefan Metzmacher <me...@samba.org> Date: Tue Feb 2 11:42:52 2016 +0100 .travis.yml: do a sort -u on the installed packages Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> commit 8adf470af231718d334e282594079a67e4da9f05 Author: Stefan Metzmacher <me...@samba.org> Date: Thu Jan 14 03:14:26 2016 +0100 ldb:ABI: add missing pyldb-util.py3-1.1.25.sigs Signed-off-by: Stefan Metzmacher <me...@samba.org> Reviewed-by: Michael Adam <ob...@samba.org> ----------------------------------------------------------------------- Summary of changes: .travis.yml | 2 +- ...ldb-util-1.1.10.sigs => pyldb-util.py3-1.1.25.sigs} | 0 script/autobuild.py | 18 ++++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util.py3-1.1.25.sigs} (100%) Changeset truncated at 500 lines: diff --git a/.travis.yml b/.travis.yml index 9d12665..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 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-crypto python-dev python-dnspython python3-crypto python3-dev python3-dnspython realpath screen xsltproc zlib1g-dev script: - git fetch --unshallow diff --git a/lib/ldb/ABI/pyldb-util-1.1.10.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs similarity index 100% copy from lib/ldb/ABI/pyldb-util-1.1.10.sigs copy to lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs 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")) -- Samba Shared Repository