bootstrap: install perl-JSON on on rpm distributions

This will be needed for the next heimdal import.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39c5d2765c33f44f8376740abd08a0f82c500d38..eac719e5ee5c0399058f70e88426f7566c16ef55 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: abd0e3b4cadc9691200c43769e69a3a7b50d9fde
+  SAMBA_CI_CONTAINER_TAG: 2b36c89aa12c35958fd95380615dde0ef5a97b9d
   #
   # 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 2c83876459dbc8b53e5713d043b0ffc2da7b10f9..43f89cf9efca7e953afb4b437a3b7e24417f466c 100644 (file)
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -147,7 +147,8 @@ PKGS = [
 
     # perl
     ('libparse-yapp-perl', 'perl-Parse-Yapp'),
-    ('libjson-perl', 'perl-JSON-Parse'),
+    ('libjson-perl', 'perl-JSON'),
+    ('', 'perl-JSON-Parse'),
     ('perl-modules', ''),
     ('', 'perl-Archive-Tar'),
     ('', 'perl-ExtUtils-MakeMaker'),

diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index 8b50b8de125b19684e30194bf9650f10876568fe..63746e248bca962cb834439a93dcd4d4c1ca751f 100755 (executable)
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -72,6 +72,7 @@ yum install -y \
     patch \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
+    perl-JSON \
     perl-JSON-Parse \
     perl-Parse-Yapp \
     perl-Test-Base \

diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 9dd36ec0daa29766e4e69fd57d72d7880f52849e..7fb9b81139769ed2bcbcee5bdbe645e31b7888b4 100644 (file)
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -58,6 +58,7 @@ packages:
   - patch
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
+  - perl-JSON
   - perl-JSON-Parse
   - perl-Parse-Yapp
   - perl-Test-Base

diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index 08cb02105a4b3d54b46ab121de60357736c6d41e..342188e7fe55ef97f6e0920a155e464e8a269bed 100755 (executable)
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -79,6 +79,7 @@ yum install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
+    perl-JSON \
     perl-Parse-Yapp \
     perl-Test-Simple \
     perl-generators \

diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index dd487a2ecede6136d444d94f543e366985b1d2aa..d82a80e69577fc4cb40fbb4aa1e9742834162ae0 100644 (file)
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -61,6 +61,7 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
+  - perl-JSON
   - perl-Parse-Yapp
   - perl-Test-Simple
   - perl-generators

diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index 3fb60bc00ebb5db3606e6cacffd2f63d6729b437..18fbfefedbc4a1416a1cb1e4503a56c68aa47e58 100755 (executable)
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -74,6 +74,7 @@ dnf install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
+    perl-JSON \
     perl-JSON-Parse \
     perl-Parse-Yapp \
     perl-Test-Base \

diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index 37422007549a373a0f0bf9ccc0fad4bc1e8e519a..6cb2ce3841fb566d04790180b8ca85bb968f57cc 100644 (file)
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -63,6 +63,7 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
+  - perl-JSON
   - perl-JSON-Parse
   - perl-Parse-Yapp
   - perl-Test-Base

diff --git a/bootstrap/generated-dists/fedora32/bootstrap.sh b/bootstrap/generated-dists/fedora32/bootstrap.sh
index 3fb60bc00ebb5db3606e6cacffd2f63d6729b437..18fbfefedbc4a1416a1cb1e4503a56c68aa47e58 100755 (executable)
--- a/bootstrap/generated-dists/fedora32/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora32/bootstrap.sh
@@ -74,6 +74,7 @@ dnf install -y \
     perl \
     perl-Archive-Tar \
     perl-ExtUtils-MakeMaker \
+    perl-JSON \
     perl-JSON-Parse \
     perl-Parse-Yapp \
     perl-Test-Base \

diff --git a/bootstrap/generated-dists/fedora32/packages.yml b/bootstrap/generated-dists/fedora32/packages.yml
index 37422007549a373a0f0bf9ccc0fad4bc1e8e519a..6cb2ce3841fb566d04790180b8ca85bb968f57cc 100644 (file)
--- a/bootstrap/generated-dists/fedora32/packages.yml
+++ b/bootstrap/generated-dists/fedora32/packages.yml
@@ -63,6 +63,7 @@ packages:
   - perl
   - perl-Archive-Tar
   - perl-ExtUtils-MakeMaker
+  - perl-JSON
   - perl-JSON-Parse
   - perl-Parse-Yapp
   - perl-Test-Base

diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index d99d835719fc97f5553c09dc7fa434daaf828dd1..33c8aeb402197b0ef47fe46835d745f4b8a45601 100755 (executable)
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -70,6 +70,7 @@ zypper --non-interactive install \
     perl \
     perl-Archive-Tar-Wrapper \
     perl-ExtUtils-MakeMaker \
+    perl-JSON \
     perl-JSON-XS \
     perl-Parse-Yapp \
     perl-Test-Base \

diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 30d102484be1e8816e72eb96f900955532e0a366..5e7b1a11d7a7220cb0f9e60f0df145cfa2e3c160 100644 (file)
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -58,6 +58,7 @@ packages:
   - perl
   - perl-Archive-Tar-Wrapper
   - perl-ExtUtils-MakeMaker
+  - perl-JSON
   - perl-JSON-XS
   - perl-Parse-Yapp
   - perl-Test-Base

diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index d99d835719fc97f5553c09dc7fa434daaf828dd1..33c8aeb402197b0ef47fe46835d745f4b8a45601 100755 (executable)
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -70,6 +70,7 @@ zypper --non-interactive install \
     perl \
     perl-Archive-Tar-Wrapper \
     perl-ExtUtils-MakeMaker \
+    perl-JSON \
     perl-JSON-XS \
     perl-Parse-Yapp \
     perl-Test-Base \

diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 30d102484be1e8816e72eb96f900955532e0a366..5e7b1a11d7a7220cb0f9e60f0df145cfa2e3c160 100644 (file)
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -58,6 +58,7 @@ packages:
   - perl
   - perl-Archive-Tar-Wrapper
   - perl-ExtUtils-MakeMaker
+  - perl-JSON
   - perl-JSON-XS
   - perl-Parse-Yapp
   - perl-Test-Base

diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index c9834e2a19d360fa172d9746bfaf1ea1f10bfe48..28d7e55a73a4a8090dea1a6e10311e7d75c931d4 100644 (file)
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-abd0e3b4cadc9691200c43769e69a3a7b50d9fde
+2b36c89aa12c35958fd95380615dde0ef5a97b9d