[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Jun 10 07:52:02 UTC 2022
The branch, master has been updated
via b22ddf5ee9c gitlab-ci: Add jq
via 73f0621a0a1 bootstrap: Fix [gm]old linker existence check
via 6b58061d229 bootstrap: Remove duplicate dict key
via 4f7c6ba50bf gitlab-ci: Allow --xz compression on our samba-testbase.tar
from e67845a73c9 ci-images: install diffutils prior to building images
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b22ddf5ee9cd06f79cdfee1d34a8ac16c00b1450
Author: Ralph Boehme <slow at samba.org>
Date: Fri Mar 18 11:47:37 2022 +0100
gitlab-ci: Add jq
Pair-Programmed-With: Jule Anger <janger at samba.org>
Signed-off-by: Ralph Boehme <slow at samba.org>
Signed-off-by: Jule Anger <janger at samba.org>
[abartlet at samba.org Regenerated sha1sum after rebase
This commit in aid of future tests for smbstatus JSON output]
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Jun 10 07:51:02 UTC 2022 on sn-devel-184
commit 73f0621a0a1266e9bedfdbd2d534e23406b81145
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Fri May 27 20:54:25 2022 +1200
bootstrap: Fix [gm]old linker existence check
We used 'test -x $LD_GOLD' to test whether the alternate linker was
available and executable. However, if $LD_GOLD expanded to an empty
string, the 'test' command would be run in single argument mode, see
that '-x' was a non-empty string, and duly return a successful status
code. The result would be a meaningless symlink created, and a
misleading message.
Because 'which' already tests that its argument is executable, the
solution is simply to remove the 'test' command.
We also invert the return code of the 'which' command so that if the
alternate linker is not found, the overall code returned to Docker is
still successful.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 6b58061d22993d991463c25765656a77281397ef
Author: Joseph Sutton <josephsutton at catalyst.net.nz>
Date: Thu May 5 21:04:02 2022 +1200
bootstrap: Remove duplicate dict key
Commit 86d4836919e29c0bdf927658df641811247534c6 added python36-gpg, but
the duplicate key lower down in the same dict meant it never had any
effect. Now it does.
Signed-off-by: Joseph Sutton <josephsutton at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4f7c6ba50bf6cab91aae9d077ccfb3b43e34de9f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Oct 14 12:01:16 2021 +1300
gitlab-ci: Allow --xz compression on our samba-testbase.tar
This may make this faster to upload to our private gitlab server
which is not as close to our runners.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14863
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci-main.yml | 21 +++++++++++++--------
bootstrap/config.py | 7 ++++---
bootstrap/generated-dists/centos7/Dockerfile | 4 ++--
bootstrap/generated-dists/centos7/bootstrap.sh | 3 +++
bootstrap/generated-dists/centos7/packages.yml | 3 +++
bootstrap/generated-dists/centos8s/Dockerfile | 4 ++--
bootstrap/generated-dists/centos8s/bootstrap.sh | 2 ++
bootstrap/generated-dists/centos8s/packages.yml | 2 ++
bootstrap/generated-dists/debian11/Dockerfile | 4 ++--
bootstrap/generated-dists/debian11/bootstrap.sh | 2 ++
bootstrap/generated-dists/debian11/packages.yml | 2 ++
bootstrap/generated-dists/f36mit120/Dockerfile | 4 ++--
bootstrap/generated-dists/f36mit120/bootstrap.sh | 2 ++
bootstrap/generated-dists/f36mit120/packages.yml | 2 ++
bootstrap/generated-dists/fedora36/Dockerfile | 4 ++--
bootstrap/generated-dists/fedora36/bootstrap.sh | 2 ++
bootstrap/generated-dists/fedora36/packages.yml | 2 ++
bootstrap/generated-dists/opensuse153/Dockerfile | 4 ++--
bootstrap/generated-dists/opensuse153/bootstrap.sh | 2 ++
bootstrap/generated-dists/opensuse153/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu1804/Dockerfile | 4 ++--
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu1804/packages.yml | 2 ++
bootstrap/generated-dists/ubuntu2004/Dockerfile | 4 ++--
bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 2 ++
bootstrap/generated-dists/ubuntu2004/packages.yml | 2 ++
bootstrap/sha1sum.txt | 2 +-
27 files changed, 68 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index ff8780128bd..2974212e888 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -30,6 +30,11 @@ variables:
#
GIT_STRATEGY: fetch
GIT_DEPTH: "3"
+ #
+ # Use GZip by default, it is fast and is good enough. Other options include --xz
+
+ SAMBA_TESTBASE_TAR_OPTIONS: -z
+
#
# we run autobuild.py inside a samba CI docker image located on gitlab's registry
# overwrite this variable if you want use your own image registry.
@@ -42,7 +47,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: 34eff4df0b3dbbfabcd74d5c50c357a6faa280d5
+ SAMBA_CI_CONTAINER_TAG: f0d5c414802246c0df46f9bbbceeda4853fd24b7
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
@@ -193,7 +198,7 @@ others:
- "*.stderr"
- "*.info"
- system-info.txt
- - samba-testbase.tar.gz
+ - samba-testbase.tar
script:
# gitlab predefines CI_JOB_NAME for each job. The gitlab job usually matches the
# autobuild name, which means we can define a default template that runs most autobuild jobs
@@ -210,9 +215,9 @@ others:
- pushd /tmp && getfacl -R samba-testbase > samba-testbase.acl.dump && popd
- chmod -R +w /tmp/samba-testbase
- mv /tmp/samba-testbase.acl.dump /tmp/samba-testbase/
- - tar cfz samba-testbase.tar.gz /tmp/samba-testbase
- - ls -la samba-testbase.tar.gz
- - sha1sum samba-testbase.tar.gz
+ - tar $SAMBA_TESTBASE_TAR_OPTIONS -cf samba-testbase.tar /tmp/samba-testbase
+ - ls -la samba-testbase.tar
+ - sha1sum samba-testbase.tar
.shared_template_test_only:
extends:
@@ -226,9 +231,9 @@ others:
- if [ -x "$(command -v krb5-config)" ]; then krb5-config --version; fi
# We unpack the artifacts file created by the .shared_template_build_only
# run we depend on
- - ls -la samba-testbase.tar.gz
- - sha1sum samba-testbase.tar.gz
- - tar xfz samba-testbase.tar.gz -C /
+ - ls -la samba-testbase.tar
+ - sha1sum samba-testbase.tar
+ - tar $SAMBA_TESTBASE_TAR_OPTIONS -xf samba-testbase.tar -C /
- diff -u /tmp/samba-testbase/image-sha1sum.txt /sha1sum.txt
- diff -u /tmp/samba-testbase/commit.txt /tmp/commit.txt
- mv /tmp/samba-testbase/samba-testbase.acl.dump /tmp/samba-testbase.acl.dump
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 59d93b14686..a204d1e19c3 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -49,6 +49,7 @@ COMMON = [
'gzip',
'hostname',
'htop',
+ 'jq',
'lcov',
'make',
'patch',
@@ -179,6 +180,7 @@ PKGS = [
('docbook-xsl', 'docbook-style-xsl'),
('', 'keyutils-libs-devel'),
('', 'which'),
+ ('xz-utils', 'xz')
]
@@ -371,9 +373,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || {{ LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }}
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || {{ LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }}
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
@@ -454,7 +456,6 @@ RPM_DISTS = {
# after epel-release installed
# however, all other python3 pkgs are still python36-ish
'python2-gpg': 'pygpgme',
- 'python3-gpg': '', # no python3-gpg yet
'@development-tools': '"@Development Tools"', # add quotes
'glibc-langpack-en': '', # included in glibc-common
'glibc-locale-source': '', # included in glibc-common
diff --git a/bootstrap/generated-dists/centos7/Dockerfile b/bootstrap/generated-dists/centos7/Dockerfile
index 3b43da9216d..ccb46541106 100644
--- a/bootstrap/generated-dists/centos7/Dockerfile
+++ b/bootstrap/generated-dists/centos7/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index ebd46784863..ad8488b596f 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -42,6 +42,7 @@ yum install -y \
hostname \
htop \
jansson-devel \
+ jq \
keyutils-libs-devel \
krb5-devel \
krb5-server \
@@ -88,6 +89,7 @@ yum install -y \
python36-cryptography \
python36-devel \
python36-dns \
+ python36-gpg \
python36-iso8601 \
python36-markdown \
python36-pyasn1 \
@@ -107,6 +109,7 @@ yum install -y \
wget \
which \
xfsprogs-devel \
+ xz \
yum-utils \
zlib-devel
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index f8a821f45dc..09b3d4b3f06 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -28,6 +28,7 @@ packages:
- hostname
- htop
- jansson-devel
+ - jq
- keyutils-libs-devel
- krb5-devel
- krb5-server
@@ -74,6 +75,7 @@ packages:
- python36-cryptography
- python36-devel
- python36-dns
+ - python36-gpg
- python36-iso8601
- python36-markdown
- python36-pyasn1
@@ -93,5 +95,6 @@ packages:
- wget
- which
- xfsprogs-devel
+ - xz
- yum-utils
- zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/centos8s/Dockerfile b/bootstrap/generated-dists/centos8s/Dockerfile
index 80a2f099026..6f8a883b075 100644
--- a/bootstrap/generated-dists/centos8s/Dockerfile
+++ b/bootstrap/generated-dists/centos8s/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/centos8s/bootstrap.sh b/bootstrap/generated-dists/centos8s/bootstrap.sh
index 5b95521f438..cc3d92eaeb4 100755
--- a/bootstrap/generated-dists/centos8s/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8s/bootstrap.sh
@@ -50,6 +50,7 @@ yum install -y \
hostname \
htop \
jansson-devel \
+ jq \
keyutils-libs-devel \
krb5-devel \
krb5-server \
@@ -117,6 +118,7 @@ yum install -y \
wget \
which \
xfsprogs-devel \
+ xz \
yum-utils \
zlib-devel
diff --git a/bootstrap/generated-dists/centos8s/packages.yml b/bootstrap/generated-dists/centos8s/packages.yml
index 79f74bbac51..5da7f2ac0d9 100644
--- a/bootstrap/generated-dists/centos8s/packages.yml
+++ b/bootstrap/generated-dists/centos8s/packages.yml
@@ -31,6 +31,7 @@ packages:
- hostname
- htop
- jansson-devel
+ - jq
- keyutils-libs-devel
- krb5-devel
- krb5-server
@@ -98,5 +99,6 @@ packages:
- wget
- which
- xfsprogs-devel
+ - xz
- yum-utils
- zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/debian11/Dockerfile b/bootstrap/generated-dists/debian11/Dockerfile
index cfd184a1d89..b7a46ca53e5 100644
--- a/bootstrap/generated-dists/debian11/Dockerfile
+++ b/bootstrap/generated-dists/debian11/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index f59d224026f..1f9cddfe8ee 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
heimdal-multidev \
hostname \
htop \
+ jq \
krb5-config \
krb5-kdc \
krb5-user \
@@ -105,6 +106,7 @@ apt-get -y install \
wget \
xfslibs-dev \
xsltproc \
+ xz-utils \
zlib1g-dev
apt-get -y autoremove
diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index d1c92af8884..e6336463721 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -24,6 +24,7 @@ packages:
- heimdal-multidev
- hostname
- htop
+ - jq
- krb5-config
- krb5-kdc
- krb5-user
@@ -94,4 +95,5 @@ packages:
- wget
- xfslibs-dev
- xsltproc
+ - xz-utils
- zlib1g-dev
\ No newline at end of file
diff --git a/bootstrap/generated-dists/f36mit120/Dockerfile b/bootstrap/generated-dists/f36mit120/Dockerfile
index 8a4ecb6f97e..803f0752a11 100644
--- a/bootstrap/generated-dists/f36mit120/Dockerfile
+++ b/bootstrap/generated-dists/f36mit120/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/f36mit120/bootstrap.sh b/bootstrap/generated-dists/f36mit120/bootstrap.sh
index 3b937f4abb1..c2bbdb18908 100755
--- a/bootstrap/generated-dists/f36mit120/bootstrap.sh
+++ b/bootstrap/generated-dists/f36mit120/bootstrap.sh
@@ -45,6 +45,7 @@ dnf install -y \
hostname \
htop \
jansson-devel \
+ jq \
keyutils-libs-devel \
krb5-devel \
krb5-server \
@@ -116,6 +117,7 @@ dnf install -y \
wget \
which \
xfsprogs-devel \
+ xz \
yum-utils \
zlib-devel
diff --git a/bootstrap/generated-dists/f36mit120/packages.yml b/bootstrap/generated-dists/f36mit120/packages.yml
index 0fb207dc137..646a282178a 100644
--- a/bootstrap/generated-dists/f36mit120/packages.yml
+++ b/bootstrap/generated-dists/f36mit120/packages.yml
@@ -31,6 +31,7 @@ packages:
- hostname
- htop
- jansson-devel
+ - jq
- keyutils-libs-devel
- krb5-devel
- krb5-server
@@ -102,5 +103,6 @@ packages:
- wget
- which
- xfsprogs-devel
+ - xz
- yum-utils
- zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/fedora36/Dockerfile b/bootstrap/generated-dists/fedora36/Dockerfile
index 8a4ecb6f97e..803f0752a11 100644
--- a/bootstrap/generated-dists/fedora36/Dockerfile
+++ b/bootstrap/generated-dists/fedora36/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/fedora36/bootstrap.sh b/bootstrap/generated-dists/fedora36/bootstrap.sh
index ad38475228f..32379e34331 100755
--- a/bootstrap/generated-dists/fedora36/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora36/bootstrap.sh
@@ -42,6 +42,7 @@ dnf install -y \
hostname \
htop \
jansson-devel \
+ jq \
keyutils-libs-devel \
krb5-devel \
krb5-server \
@@ -113,6 +114,7 @@ dnf install -y \
wget \
which \
xfsprogs-devel \
+ xz \
yum-utils \
zlib-devel
diff --git a/bootstrap/generated-dists/fedora36/packages.yml b/bootstrap/generated-dists/fedora36/packages.yml
index 0fb207dc137..646a282178a 100644
--- a/bootstrap/generated-dists/fedora36/packages.yml
+++ b/bootstrap/generated-dists/fedora36/packages.yml
@@ -31,6 +31,7 @@ packages:
- hostname
- htop
- jansson-devel
+ - jq
- keyutils-libs-devel
- krb5-devel
- krb5-server
@@ -102,5 +103,6 @@ packages:
- wget
- which
- xfsprogs-devel
+ - xz
- yum-utils
- zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/opensuse153/Dockerfile b/bootstrap/generated-dists/opensuse153/Dockerfile
index b977f644448..f252e8b2877 100644
--- a/bootstrap/generated-dists/opensuse153/Dockerfile
+++ b/bootstrap/generated-dists/opensuse153/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/opensuse153/bootstrap.sh b/bootstrap/generated-dists/opensuse153/bootstrap.sh
index 8f1715f9edb..fb155f18312 100755
--- a/bootstrap/generated-dists/opensuse153/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse153/bootstrap.sh
@@ -39,6 +39,7 @@ zypper --non-interactive install \
gzip \
hostname \
htop \
+ jq \
keyutils-devel \
krb5-client \
krb5-devel \
@@ -106,6 +107,7 @@ zypper --non-interactive install \
wget \
which \
xfsprogs-devel \
+ xz \
yum-utils \
zlib-devel
diff --git a/bootstrap/generated-dists/opensuse153/packages.yml b/bootstrap/generated-dists/opensuse153/packages.yml
index 29fa159b5d4..d555584c630 100644
--- a/bootstrap/generated-dists/opensuse153/packages.yml
+++ b/bootstrap/generated-dists/opensuse153/packages.yml
@@ -27,6 +27,7 @@ packages:
- gzip
- hostname
- htop
+ - jq
- keyutils-devel
- krb5-client
- krb5-devel
@@ -94,5 +95,6 @@ packages:
- wget
- which
- xfsprogs-devel
+ - xz
- yum-utils
- zlib-devel
\ No newline at end of file
diff --git a/bootstrap/generated-dists/ubuntu1804/Dockerfile b/bootstrap/generated-dists/ubuntu1804/Dockerfile
index a66dc3f2324..9ab534d7b9d 100644
--- a/bootstrap/generated-dists/ubuntu1804/Dockerfile
+++ b/bootstrap/generated-dists/ubuntu1804/Dockerfile
@@ -14,9 +14,9 @@ ADD *.sh /tmp/
RUN /tmp/bootstrap.sh && /tmp/locale.sh
# if ld.gold exists, force link it to ld
-RUN set -x; LD=$(which ld); LD_GOLD=$(which ld.gold); test -x $LD_GOLD && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"
+RUN set -x; ! LD_GOLD=$(which ld.gold) || { LD=$(which ld) && ln -sf $LD_GOLD $LD && test -x $LD && echo "$LD is now $LD_GOLD"; }
# if ld.mold exists, force link it to ld (prefer mold over gold! ;-)
-RUN set -x; LD=$(which ld); LD_MOLD=$(which ld.mold); test -x $LD_MOLD && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"
+RUN set -x; ! LD_MOLD=$(which ld.mold) || { LD=$(which ld) && ln -sf $LD_MOLD $LD && test -x $LD && echo "$LD is now $LD_MOLD"; }
# make test can not work with root, so we have to create a new user
RUN useradd -m -U -s /bin/bash samba && \
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 6a28e2d655d..56e7b805dfd 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -35,6 +35,7 @@ apt-get -y install \
heimdal-multidev \
hostname \
htop \
+ jq \
krb5-config \
krb5-kdc \
krb5-user \
@@ -105,6 +106,7 @@ apt-get -y install \
wget \
xfslibs-dev \
xsltproc \
+ xz-utils \
zlib1g-dev
apt-get -y autoremove
diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index e03b05a6e4a..b42b4d05989 100644
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -24,6 +24,7 @@ packages:
- heimdal-multidev
- hostname
- htop
+ - jq
- krb5-config
- krb5-kdc
- krb5-user
@@ -94,4 +95,5 @@ packages:
--
Samba Shared Repository
More information about the samba-cvs
mailing list