From 9a3c558aa442aef10d8edcfe811cc23afb9b2b4c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Oct 2023 10:15:42 +0000 Subject: [PATCH] bootstrap: install codespell, shfmt and shellcheck also on debian/ubuntu Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- .gitlab-ci-main.yml | 2 +- bootstrap/config.py | 11 ++++++++--- bootstrap/generated-dists/debian11-32bit/bootstrap.sh | 2 ++ bootstrap/generated-dists/debian11-32bit/packages.yml | 2 ++ bootstrap/generated-dists/debian11/bootstrap.sh | 2 ++ bootstrap/generated-dists/debian11/packages.yml | 2 ++ bootstrap/generated-dists/debian12-32bit/bootstrap.sh | 3 +++ bootstrap/generated-dists/debian12-32bit/packages.yml | 3 +++ bootstrap/generated-dists/debian12/bootstrap.sh | 3 +++ bootstrap/generated-dists/debian12/packages.yml | 3 +++ .../generated-dists/ubuntu1804-32bit/bootstrap.sh | 2 ++ .../generated-dists/ubuntu1804-32bit/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 2 ++ bootstrap/generated-dists/ubuntu1804/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu2004/bootstrap.sh | 2 ++ bootstrap/generated-dists/ubuntu2004/packages.yml | 2 ++ bootstrap/generated-dists/ubuntu2204/bootstrap.sh | 3 +++ bootstrap/generated-dists/ubuntu2204/packages.yml | 3 +++ bootstrap/sha1sum.txt | 2 +- 19 files changed, 48 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index 9c1ddc69fd5..5a595191b8d 100644 --- 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 d531dfc0e63..cfee5e049ce 100644 --- 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 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 6d9fd592fd9..82d2705c092 100755 --- 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 97e92fea247..dab6a93e10c 100644 --- 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 6d9fd592fd9..82d2705c092 100755 --- 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 97e92fea247..dab6a93e10c 100644 --- 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 d6f53c29f8e..033061ad7e6 100755 --- 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 a9547d57380..bd9a558ffbb 100644 --- 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 d6f53c29f8e..033061ad7e6 100755 --- 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 a9547d57380..bd9a558ffbb 100644 --- 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 10276208d68..da249a8724c 100755 --- 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 2544f9cf8f5..94957fc07b2 100644 --- 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 10276208d68..da249a8724c 100755 --- 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 2544f9cf8f5..94957fc07b2 100644 --- 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 10276208d68..da249a8724c 100755 --- 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 2544f9cf8f5..94957fc07b2 100644 --- 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 d8a7a72178f..1a3c3b14efb 100755 --- 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 a22a4100fc6..c3b741fbc69 100644 --- 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 786d4e7ebb5..9d2acc49de9 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -21a93787675107f010836bbfa5e8542c272bc4b0 +07a822597b5bce4af9e8e2987856b27eb20bd1b7 -- 2.47.3