summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2022-02-13 12:08:57 +0100
committerAndreas Schneider <asn@cryptomilk.org>2022-02-15 12:31:43 +0000
commit3bc00dfdd6f3541b02eeaa718db49c2838a27e53 (patch)
tree04d73a460bf3b4a8bfd358acf340686d84549edd
parentd409c23832c89e014e86f3f09a3601032b163d80 (diff)
downloadsamba-3bc00dfdd6f3541b02eeaa718db49c2838a27e53.tar.gz
bootstrap: Install mold linker on Fedora 35
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Tue Feb 15 12:31:43 UTC 2022 on sn-devel-184
-rw-r--r--.gitlab-ci-main.yml2
-rw-r--r--bootstrap/config.py6
-rwxr-xr-xbootstrap/generated-dists/fedora35/bootstrap.sh1
-rw-r--r--bootstrap/generated-dists/fedora35/packages.yml1
-rw-r--r--bootstrap/sha1sum.txt2
5 files changed, 10 insertions, 2 deletions
diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index f6eed880fe1..441878df949 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -42,7 +42,7 @@ variables:
# Set this to the contents of bootstrap/sha1sum.txt
# which is generated by bootstrap/template.py --render
#
- SAMBA_CI_CONTAINER_TAG: db1a33142c66b8dabd5bc3ac439364ff55d60461
+ SAMBA_CI_CONTAINER_TAG: bac18584d47ffc1acb5a697d83f2232598b6afbf
#
# We use the ubuntu1804 image as default as
# it matches what we have on sn-devel-184.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 27e6d22d3f5..8bcb9ddbb26 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -131,6 +131,7 @@ PKGS = [
('', 'libtirpc-devel'), # for <rpc/rpc.h> header on fedora
('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
('mawk', 'gawk'),
+ ('', 'mold'),
('python3', 'python3'),
('python3-cryptography', 'python3-cryptography'), # for krb5 tests
@@ -459,6 +460,7 @@ RPM_DISTS = {
'liburing-devel': '', # not available
'python3-setproctitle': 'python36-setproctitle',
'tracker-devel': '', # do not install
+ 'mold': '',
}
},
'centos8s': {
@@ -473,6 +475,7 @@ RPM_DISTS = {
'perl-Test-Base': 'perl-Test-Simple',
'perl-FindBin': '',
'liburing-devel': '', # not available yet, Add me back, once available!
+ 'mold': '',
}
},
'fedora34': {
@@ -484,6 +487,7 @@ RPM_DISTS = {
'perl-FindBin': '',
'python3-iso8601': 'python3-dateutil',
'libtracker-sparql-2.0-dev': '', # only tracker 3.x is available
+ 'mold': '',
}
},
'fedora35': {
@@ -526,6 +530,7 @@ RPM_DISTS = {
'libtasn1-tools': '', # asn1Parser is part of libtasn1
'mingw64-gcc': '', # doesn't exist
'liburing-devel': '', # not available
+ 'mold': '',
}
},
'opensuse152': {
@@ -556,6 +561,7 @@ RPM_DISTS = {
'quota-devel': '',
'glusterfs-api-devel': '',
'libtasn1-tools': '', # asn1Parser is part of libtasn1
+ 'mold': '',
}
}
}
diff --git a/bootstrap/generated-dists/fedora35/bootstrap.sh b/bootstrap/generated-dists/fedora35/bootstrap.sh
index de5a9670601..0d8a3366ab9 100755
--- a/bootstrap/generated-dists/fedora35/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora35/bootstrap.sh
@@ -67,6 +67,7 @@ dnf install -y \
lmdb-devel \
make \
mingw64-gcc \
+ mold \
ncurses-devel \
openldap-devel \
pam-devel \
diff --git a/bootstrap/generated-dists/fedora35/packages.yml b/bootstrap/generated-dists/fedora35/packages.yml
index 749f30dfc0e..b4a5ec40ab9 100644
--- a/bootstrap/generated-dists/fedora35/packages.yml
+++ b/bootstrap/generated-dists/fedora35/packages.yml
@@ -56,6 +56,7 @@ packages:
- lmdb-devel
- make
- mingw64-gcc
+ - mold
- ncurses-devel
- openldap-devel
- pam-devel
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 4efaba8152f..aa96502dd76 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-db1a33142c66b8dabd5bc3ac439364ff55d60461
+bac18584d47ffc1acb5a697d83f2232598b6afbf