[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue Apr 30 18:49:02 UTC 2019
The branch, master has been updated
via 4dd8db321f1 gitlab-ci: Update for building new containers
via e48a6c846f4 bootstrap: Only install required packages on openSUSE
via 9e29ddd4be5 bootstrap: Only install required packages on Fedora
via 09962c1b7e3 wafsamba: Add compiler check for missing field initializer check
from d88f1c82b2f credentials: Workaround krb5_cc_remove_cred not implemented in MIT kerberos
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 4dd8db321f19c06db3f7e4eec43cc44c1cc68716
Author: Andreas Schneider <asn at samba.org>
Date: Tue Apr 30 14:12:55 2019 +0200
gitlab-ci: Update for building new containers
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Apr 30 18:48:18 UTC 2019 on sn-devel-184
commit e48a6c846f40d83187beb8ed5c36bc2f75baaef2
Author: Andreas Schneider <asn at samba.org>
Date: Tue Apr 30 09:59:15 2019 +0200
bootstrap: Only install required packages on openSUSE
This should reduce the amount of packages installed. And make building
the image much faster!
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 9e29ddd4be5a7397a3657ae339d115187544312a
Author: Andreas Schneider <asn at samba.org>
Date: Tue Apr 30 10:10:24 2019 +0200
bootstrap: Only install required packages on Fedora
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: Stefan Metzmacher <metze at samba.org>
commit 09962c1b7e37a9b3c02fa88e1253bee3b206ac19
Author: Christof Schmitt <cs at samba.org>
Date: Mon Apr 29 13:07:08 2019 -0700
wafsamba: Add compiler check for missing field initializer check
The commit cf79ee15
wafsamba: Enable warnings for missing field initializer
enabled a compiler check for warnings about missing initializers for all
developer builds. This fails with older compilers, e.g. gcc on RHEL7.
Add a waf check around adding the compiler option to avoid the failure
with older compilers.
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 2 +-
bootstrap/config.py | 6 ++++--
bootstrap/generated-dists/fedora28/bootstrap.sh | 1 +
bootstrap/generated-dists/fedora29/bootstrap.sh | 1 +
bootstrap/generated-dists/opensuse150/bootstrap.sh | 5 +++--
bootstrap/sha1sum.txt | 2 +-
buildtools/wafsamba/samba_autoconf.py | 8 +++++++-
7 files changed, 18 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 01ef8e0e6b9..86fd2fb2778 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: a63fcd17331238531d472206e34aa24c9fc46bb1
+ SAMBA_CI_CONTAINER_TAG: 4cc4709edd40e4e7c64f9eb255f953eed7924b1f
#
# The following images are available
# Please see the samba-o3 sections at the end of this file!
diff --git a/bootstrap/config.py b/bootstrap/config.py
index b15a7d4c3cf..ac2628530f1 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -228,6 +228,7 @@ set -xueo pipefail
dnf update -y
dnf install -y \
+ --setopt=install_weak_deps=False \
{pkgs}
dnf clean all
@@ -241,8 +242,9 @@ set -xueo pipefail
zypper --non-interactive refresh
zypper --non-interactive update
zypper --non-interactive install \
- {pkgs} \
- system-user-nobody
+ --no-recommends \
+ system-user-nobody \
+ {pkgs}
zypper --non-interactive clean
diff --git a/bootstrap/generated-dists/fedora28/bootstrap.sh b/bootstrap/generated-dists/fedora28/bootstrap.sh
index aa9d64c492a..274459257ed 100755
--- a/bootstrap/generated-dists/fedora28/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora28/bootstrap.sh
@@ -10,6 +10,7 @@ set -xueo pipefail
dnf update -y
dnf install -y \
+ --setopt=install_weak_deps=False \
@development-tools \
acl \
attr \
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index aa9d64c492a..274459257ed 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -10,6 +10,7 @@ set -xueo pipefail
dnf update -y
dnf install -y \
+ --setopt=install_weak_deps=False \
@development-tools \
acl \
attr \
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 0d79288ef3f..4f42c526375 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -10,6 +10,8 @@ set -xueo pipefail
zypper --non-interactive refresh
zypper --non-interactive update
zypper --non-interactive install \
+ --no-recommends \
+ system-user-nobody \
acl \
attr \
autoconf \
@@ -99,8 +101,7 @@ zypper --non-interactive install \
which \
xfsprogs-devel \
yum-utils \
- zlib-devel \
- system-user-nobody
+ zlib-devel
zypper --non-interactive clean
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index a522f0566a6..dca78add500 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-a63fcd17331238531d472206e34aa24c9fc46bb1
+4cc4709edd40e4e7c64f9eb255f953eed7924b1f
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index f2b049e40a7..06ec7da333a 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -731,7 +731,13 @@ def SAMBA_CONFIG_H(conf, path=None):
conf.ADD_CFLAGS('-Wall', testflags=True)
conf.ADD_CFLAGS('-Wshadow', testflags=True)
conf.ADD_CFLAGS('-Wmissing-prototypes', testflags=True)
- conf.ADD_CFLAGS('-Wmissing-field-initializers', testflags=True)
+ if CHECK_CODE(conf,
+ 'struct a { int b; }; struct c { struct a d; } e = { };',
+ 'CHECK_C99_INIT',
+ link=False,
+ cflags='-Wmissing-field-initializers -Werror=missing-field-initializers',
+ msg="Checking C99 init of nested structs."):
+ conf.ADD_CFLAGS('-Wmissing-field-initializers', testflags=True)
conf.ADD_CFLAGS('-Wcast-align -Wcast-qual', testflags=True)
conf.ADD_CFLAGS('-fno-common', testflags=True)
--
Samba Shared Repository
More information about the samba-cvs
mailing list