summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2021-10-14 14:50:41 +1100
committerAndrew Bartlett <abartlet@samba.org>2021-10-18 17:19:17 +0000
commitc901adaa0d4526deff550806e49976d686122674 (patch)
treeb40c522bb0b28fdde1e3ba159b1e3e8bb69b6ef1 /bootstrap
parent9d3a691920205f8a9dc05d0e173e25e6a335f139 (diff)
downloadsamba-c901adaa0d4526deff550806e49976d686122674.tar.gz
bootstrap: Add Debian 11
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14872 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Andrew Bartlett <abartlet@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Mon Oct 18 17:19:17 UTC 2021 on sn-devel-184
Diffstat (limited to 'bootstrap')
-rw-r--r--bootstrap/.gitlab-ci.yml3
-rw-r--r--bootstrap/config.py8
-rw-r--r--bootstrap/generated-dists/Vagrantfile7
-rw-r--r--bootstrap/generated-dists/debian11/Dockerfile27
-rwxr-xr-xbootstrap/generated-dists/debian11/bootstrap.sh111
-rwxr-xr-xbootstrap/generated-dists/debian11/locale.sh55
-rw-r--r--bootstrap/generated-dists/debian11/packages.yml96
-rw-r--r--bootstrap/sha1sum.txt2
8 files changed, 308 insertions, 1 deletions
diff --git a/bootstrap/.gitlab-ci.yml b/bootstrap/.gitlab-ci.yml
index 1cef89374de..01da6106b53 100644
--- a/bootstrap/.gitlab-ci.yml
+++ b/bootstrap/.gitlab-ci.yml
@@ -97,6 +97,9 @@ ubuntu2004:
debian10:
extends: .build_image_template
+debian11:
+ extends: .build_image_template
+
fedora33:
extends: .build_image_template
diff --git a/bootstrap/config.py b/bootstrap/config.py
index 7fe3bbd956a..c98ece513ec 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -399,6 +399,14 @@ DEB_DISTS = {
'liburing-dev': '', # not available
}
},
+ 'debian11': {
+ 'docker_image': 'debian:11',
+ 'vagrant_box': 'debian/bullseye64',
+ 'replace': {
+ 'language-pack-en': '', # included in locales
+ 'liburing-dev': '', # not available
+ }
+ },
'ubuntu1804': {
'docker_image': 'ubuntu:18.04',
'vagrant_box': 'ubuntu/bionic64',
diff --git a/bootstrap/generated-dists/Vagrantfile b/bootstrap/generated-dists/Vagrantfile
index 7c1e0d80c6a..358d8e23d59 100644
--- a/bootstrap/generated-dists/Vagrantfile
+++ b/bootstrap/generated-dists/Vagrantfile
@@ -31,6 +31,13 @@ Vagrant.configure("2") do |config|
v.vm.provision :shell, path: "debian10/locale.sh"
end
+ config.vm.define "debian11" do |v|
+ v.vm.box = "debian/bullseye64"
+ v.vm.hostname = "debian11"
+ v.vm.provision :shell, path: "debian11/bootstrap.sh"
+ v.vm.provision :shell, path: "debian11/locale.sh"
+ end
+
config.vm.define "fedora33" do |v|
v.vm.box = "fedora/33-cloud-base"
v.vm.hostname = "fedora33"
diff --git a/bootstrap/generated-dists/debian11/Dockerfile b/bootstrap/generated-dists/debian11/Dockerfile
new file mode 100644
index 00000000000..6a16324f201
--- /dev/null
+++ b/bootstrap/generated-dists/debian11/Dockerfile
@@ -0,0 +1,27 @@
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+FROM debian:11
+
+# pass in with --build-arg while build
+ARG SHA1SUM
+RUN [ -n $SHA1SUM ] && echo $SHA1SUM > /sha1sum.txt
+
+ADD *.sh /tmp/
+# need root permission, do it before USER samba
+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"
+
+# make test can not work with root, so we have to create a new user
+RUN useradd -m -U -s /bin/bash samba && \
+ mkdir -p /etc/sudoers.d && \
+ echo "samba ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/samba
+
+USER samba
+WORKDIR /home/samba
+# samba tests rely on this
+ENV USER=samba LC_ALL=en_US.utf8 LANG=en_US.utf8 \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
new file mode 100755
index 00000000000..84f5f6855b7
--- /dev/null
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -0,0 +1,111 @@
+#!/bin/bash
+
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+set -xueo pipefail
+
+export DEBIAN_FRONTEND=noninteractive
+apt-get -y update
+
+apt-get -y install \
+ acl \
+ apt-utils \
+ attr \
+ autoconf \
+ bind9utils \
+ binutils \
+ bison \
+ build-essential \
+ ccache \
+ chrpath \
+ curl \
+ debhelper \
+ dnsutils \
+ docbook-xml \
+ docbook-xsl \
+ flex \
+ gcc \
+ gdb \
+ git \
+ glusterfs-common \
+ gzip \
+ heimdal-multidev \
+ hostname \
+ htop \
+ krb5-config \
+ krb5-kdc \
+ krb5-user \
+ lcov \
+ libacl1-dev \
+ libarchive-dev \
+ libattr1-dev \
+ libavahi-common-dev \
+ libblkid-dev \
+ libbsd-dev \
+ libcap-dev \
+ libcephfs-dev \
+ libcups2-dev \
+ libdbus-1-dev \
+ libglib2.0-dev \
+ libgnutls28-dev \
+ libgpgme11-dev \
+ libicu-dev \
+ libjansson-dev \
+ libjs-jquery \
+ libjson-perl \
+ libkrb5-dev \
+ libldap2-dev \
+ liblmdb-dev \
+ libncurses5-dev \
+ libpam0g-dev \
+ libparse-yapp-perl \
+ libpcap-dev \
+ libpopt-dev \
+ libreadline-dev \
+ libsystemd-dev \
+ libtasn1-bin \
+ libtasn1-dev \
+ libtracker-sparql-2.0-dev \
+ libunwind-dev \
+ lmdb-utils \
+ locales \
+ lsb-release \
+ make \
+ mawk \
+ mingw-w64 \
+ patch \
+ perl \
+ perl-modules \
+ pkg-config \
+ procps \
+ psmisc \
+ python3 \
+ python3-cryptography \
+ python3-dbg \
+ python3-dev \
+ python3-dnspython \
+ python3-gpg \
+ python3-iso8601 \
+ python3-markdown \
+ python3-matplotlib \
+ python3-pexpect \
+ python3-pyasn1 \
+ python3-setproctitle \
+ rng-tools \
+ rsync \
+ sed \
+ sudo \
+ tar \
+ tree \
+ uuid-dev \
+ wget \
+ xfslibs-dev \
+ xsltproc \
+ zlib1g-dev
+
+apt-get -y autoremove
+apt-get -y autoclean
+apt-get -y clean \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian11/locale.sh b/bootstrap/generated-dists/debian11/locale.sh
new file mode 100755
index 00000000000..cc64e180483
--- /dev/null
+++ b/bootstrap/generated-dists/debian11/locale.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+#
+# This file is generated by 'bootstrap/template.py --render'
+# See also bootstrap/config.py
+#
+
+set -xueo pipefail
+
+# refer to /usr/share/i18n/locales
+INPUTFILE=en_US
+# refer to /usr/share/i18n/charmaps
+CHARMAP=UTF-8
+# locale to generate in /usr/lib/locale
+# glibc/localedef will normalize UTF-8 to utf8, follow the naming style
+LOCALE=$INPUTFILE.utf8
+
+# if locale is already correct, exit
+( locale | grep LC_ALL | grep -i $LOCALE ) && exit 0
+
+# if locale not available, generate locale into /usr/lib/locale
+if ! ( locale --all-locales | grep -i $LOCALE )
+then
+ # no-archive means create its own dir
+ localedef --inputfile $INPUTFILE --charmap $CHARMAP --no-archive $LOCALE
+fi
+
+# update locale conf and global env file
+# set both LC_ALL and LANG for safe
+
+# update conf for Debian family
+FILE=/etc/default/locale
+if [ -f $FILE ]
+then
+ echo LC_ALL="$LOCALE" > $FILE
+ echo LANG="$LOCALE" >> $FILE
+fi
+
+# update conf for RedHat family
+FILE=/etc/locale.conf
+if [ -f $FILE ]
+then
+ # LC_ALL is not valid in this file, set LANG only
+ echo LANG="$LOCALE" > $FILE
+fi
+
+# update global env file
+FILE=/etc/environment
+if [ -f $FILE ]
+then
+ # append LC_ALL if not exist
+ grep LC_ALL $FILE || echo LC_ALL="$LOCALE" >> $FILE
+ # append LANG if not exist
+ grep LANG $FILE || echo LANG="$LOCALE" >> $FILE
+fi \ No newline at end of file
diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
new file mode 100644
index 00000000000..32f37eeb013
--- /dev/null
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -0,0 +1,96 @@
+---
+packages:
+ - acl
+ - apt-utils
+ - attr
+ - autoconf
+ - bind9utils
+ - binutils
+ - bison
+ - build-essential
+ - ccache
+ - chrpath
+ - curl
+ - debhelper
+ - dnsutils
+ - docbook-xml
+ - docbook-xsl
+ - flex
+ - gcc
+ - gdb
+ - git
+ - glusterfs-common
+ - gzip
+ - heimdal-multidev
+ - hostname
+ - htop
+ - krb5-config
+ - krb5-kdc
+ - krb5-user
+ - lcov
+ - libacl1-dev
+ - libarchive-dev
+ - libattr1-dev
+ - libavahi-common-dev
+ - libblkid-dev
+ - libbsd-dev
+ - libcap-dev
+ - libcephfs-dev
+ - libcups2-dev
+ - libdbus-1-dev
+ - libglib2.0-dev
+ - libgnutls28-dev
+ - libgpgme11-dev
+ - libicu-dev
+ - libjansson-dev
+ - libjs-jquery
+ - libjson-perl
+ - libkrb5-dev
+ - libldap2-dev
+ - liblmdb-dev
+ - libncurses5-dev
+ - libpam0g-dev
+ - libparse-yapp-perl
+ - libpcap-dev
+ - libpopt-dev
+ - libreadline-dev
+ - libsystemd-dev
+ - libtasn1-bin
+ - libtasn1-dev
+ - libtracker-sparql-2.0-dev
+ - libunwind-dev
+ - lmdb-utils
+ - locales
+ - lsb-release
+ - make
+ - mawk
+ - mingw-w64
+ - patch
+ - perl
+ - perl-modules
+ - pkg-config
+ - procps
+ - psmisc
+ - python3
+ - python3-cryptography
+ - python3-dbg
+ - python3-dev
+ - python3-dnspython
+ - python3-gpg
+ - python3-iso8601
+ - python3-markdown
+ - python3-matplotlib
+ - python3-pexpect
+ - python3-pyasn1
+ - python3-setproctitle
+ - rng-tools
+ - rsync
+ - sed
+ - sudo
+ - tar
+ - tree
+ - uuid-dev
+ - wget
+ - xfslibs-dev
+ - xsltproc
+ - zlib1g-dev \ No newline at end of file
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index d417a38df9a..a9996ecf27d 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-752c448d3186fe93a0c4039b8fbe897bb67a1f33
+8d90789fe49d9003a7e5c66b1a00639bcce1238f