bootstrap: install codespell, shfmt and shellcheck also on debian/ubuntu

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index 9c1ddc69fd56d19df274ad9d6c1a66959d4cc77e..5a595191b8db54a6edf7d7e64ab780ed8f8121ba 100644 (file)
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -47,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: 21a93787675107f010836bbfa5e8542c272bc4b0
+  SAMBA_CI_CONTAINER_TAG: 07a822597b5bce4af9e8e2987856b27eb20bd1b7
   #
   # We use the ubuntu2204 image as default as
   # it matches what we have on atb-devel-224

diff --git a/bootstrap/config.py b/bootstrap/config.py
index d531dfc0e63f9b27dd945eb18e40fb1f7d8a95fe..cfee5e049cecc18c8e0b72805a4932ce7e693ef3 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -42,6 +42,7 @@ COMMON = [
     'ccache',
     'curl',
     'chrpath',
+    'codespell',
     'flex',
     'gcc',
     'gdb',
@@ -58,6 +59,7 @@ COMMON = [
     'rng-tools',
     'rsync',
     'sed',
+    'shfmt',
     'sudo',  # docker images has no sudo by default
     'tar',
     'tree',
@@ -134,10 +136,8 @@ PKGS = [
     ('', 'rpcsvc-proto-devel'), # for <rpcsvc/rquota.h> header
     ('mawk', 'gawk'),
     ('', 'mold'),
-    ('', 'ShellCheck'),
-    ('', 'shfmt'),
+    ('shellcheck', 'ShellCheck'),
     ('', 'crypto-policies-scripts'),
-    ('', 'codespell'),
 
     ('python3', 'python3'),
     ('python3-cryptography', 'python3-cryptography'), # for krb5 tests
@@ -420,6 +420,7 @@ DEB_DISTS = {
         'vagrant_box': 'debian/bullseye64',
         'replace': {
             'language-pack-en': '',   # included in locales
+            'shfmt': '',
         }
     },
     'debian11-32bit': {
@@ -427,6 +428,7 @@ DEB_DISTS = {
         'vagrant_box': 'debian/bullseye32',
         'replace': {
             'language-pack-en': '',   # included in locales
+            'shfmt': '',
         }
     },
     'debian12': {
@@ -450,6 +452,7 @@ DEB_DISTS = {
         'vagrant_box': 'ubuntu/bionic64',
         'replace': {
             'liburing-dev': '',   # not available
+            'shfmt': '',
         }
     },
     'ubuntu1804-32bit': {
@@ -457,6 +460,7 @@ DEB_DISTS = {
         'vagrant_box': 'ubuntu/bionic32',
         'replace': {
             'liburing-dev': '',   # not available
+            'shfmt': '',
         }
     },
     'ubuntu2004': {
@@ -464,6 +468,7 @@ DEB_DISTS = {
         'vagrant_box': 'ubuntu/focal64',
         'replace': {
             'liburing-dev': '',   # not available
+            'shfmt': '',
         }
     },
     'ubuntu2204': {

diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index 6d9fd592fd9e821c4226282e0df820632b002312..82d2705c092420a54e1c6f15f5fd39201c23cadd 100755 (executable)
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 97e92fea247dfba9e9f96c3b874a192ff8f8f1b1..dab6a93e10c8f8840279115352678b8fd3f2e08c 100644 (file)
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -89,6 +90,7 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index 6d9fd592fd9e821c4226282e0df820632b002312..82d2705c092420a54e1c6f15f5fd39201c23cadd 100755 (executable)
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 97e92fea247dfba9e9f96c3b874a192ff8f8f1b1..dab6a93e10c8f8840279115352678b8fd3f2e08c 100644 (file)
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -89,6 +90,7 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index d6f53c29f8ea7f4403bf3778047378a1b04b6ea5..033061ad7e62ac78cc59bf7c8411b4c9cb46d4cf 100755 (executable)
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -99,6 +100,8 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
+    shfmt \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml
index a9547d57380622823d7caa0bede69dd20b1646b6..bd9a558ffbb1724a807f2f7d9529d63c569a3698 100644 (file)
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -88,6 +89,8 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
+  - shfmt
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh
index d6f53c29f8ea7f4403bf3778047378a1b04b6ea5..033061ad7e62ac78cc59bf7c8411b4c9cb46d4cf 100755 (executable)
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -99,6 +100,8 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
+    shfmt \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml
index a9547d57380622823d7caa0bede69dd20b1646b6..bd9a558ffbb1724a807f2f7d9529d63c569a3698 100644 (file)
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -88,6 +89,8 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
+  - shfmt
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
index 10276208d68c1ed5de3bcf41c9cef0207598e158..da249a8724c3ac6df4f93048064ce026d5e9ba6e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
index 2544f9cf8f56c368ba82a9cd367c29b830ac9cca..94957fc07b2761092e19eff9c414e847ebc7f06f 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804-32bit/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -89,6 +90,7 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index 10276208d68c1ed5de3bcf41c9cef0207598e158..da249a8724c3ac6df4f93048064ce026d5e9ba6e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/ubuntu1804/packages.yml b/bootstrap/generated-dists/ubuntu1804/packages.yml
index 2544f9cf8f56c368ba82a9cd367c29b830ac9cca..94957fc07b2761092e19eff9c414e847ebc7f06f 100644 (file)
--- a/bootstrap/generated-dists/ubuntu1804/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1804/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -89,6 +90,7 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
index 10276208d68c1ed5de3bcf41c9cef0207598e158..da249a8724c3ac6df4f93048064ce026d5e9ba6e 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2004/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -100,6 +101,7 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/ubuntu2004/packages.yml b/bootstrap/generated-dists/ubuntu2004/packages.yml
index 2544f9cf8f56c368ba82a9cd367c29b830ac9cca..94957fc07b2761092e19eff9c414e847ebc7f06f 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2004/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2004/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -89,6 +90,7 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
   - sudo
   - tar
   - tree

diff --git a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
index d8a7a72178f4cf8ce9f57d4435e5d9acaecc7a7b..1a3c3b14efbc6fe9414f77b4ffe8b7ca2144bada 100755 (executable)
--- a/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu2204/bootstrap.sh
@@ -21,6 +21,7 @@ apt-get -y install \
     build-essential \
     ccache \
     chrpath \
+    codespell \
     curl \
     debhelper \
     dnsutils \
@@ -100,6 +101,8 @@ apt-get -y install \
     rng-tools \
     rsync \
     sed \
+    shellcheck \
+    shfmt \
     sudo \
     tar \
     tree \

diff --git a/bootstrap/generated-dists/ubuntu2204/packages.yml b/bootstrap/generated-dists/ubuntu2204/packages.yml
index a22a4100fc67dc9f1de62a47d9415efdebd3146f..c3b741fbc69493b61d00fa545813451e975dd953 100644 (file)
--- a/bootstrap/generated-dists/ubuntu2204/packages.yml
+++ b/bootstrap/generated-dists/ubuntu2204/packages.yml
@@ -10,6 +10,7 @@ packages:
   - build-essential
   - ccache
   - chrpath
+  - codespell
   - curl
   - debhelper
   - dnsutils
@@ -89,6 +90,8 @@ packages:
   - rng-tools
   - rsync
   - sed
+  - shellcheck
+  - shfmt
   - sudo
   - tar
   - tree

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 786d4e7ebb57a8474e6849d2062fa55e358a37b3..9d2acc49de9144436c3eb38fc6183a5d6c436a43 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-21a93787675107f010836bbfa5e8542c272bc4b0
+07a822597b5bce4af9e8e2987856b27eb20bd1b7