From: David Mulder <dmulder@samba.org>
Date: Tue, 13 Aug 2024 19:26:37 +0000 (-0600)
Subject: Debian cargo is far to old for building
X-Git-Tag: tdb-1.4.13~894
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4ac7e56bcabe45d5e9e389c159358d9ba241bbc2;p=thirdparty%2Fsamba.git

Debian cargo is far to old for building

Debian ships a very old version of cargo, and
none of our rust code can build with it.

Signed-off-by: David Mulder <dmulder@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index ed9c83fb037..80d30425d15 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: e8921f91497f528c3f07d31e67e48b79dcba3705
+  SAMBA_CI_CONTAINER_TAG: 38de01039fd443a1392050bdd4eab6cdc83f2e53
   #
   # 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 d0e826208a6..d25fbfd6a36 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -447,6 +447,7 @@ DEB_DISTS = {
         'replace': {
             'language-pack-en': '',   # included in locales
             'shfmt': '',
+            'cargo': '', # included cargo is broken
         }
     },
     'debian11-32bit': {
@@ -455,6 +456,7 @@ DEB_DISTS = {
         'replace': {
             'language-pack-en': '',   # included in locales
             'shfmt': '',
+            'cargo': '', # included cargo is broken
         }
     },
     'debian12': {
@@ -463,6 +465,7 @@ DEB_DISTS = {
         'replace': {
             'language-pack-en': '',   # included in locales
             'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
+            'cargo': '', # included cargo is broken
         }
     },
     'debian12-32bit': {
@@ -471,6 +474,7 @@ DEB_DISTS = {
         'replace': {
             'language-pack-en': '',   # included in locales
             'libtracker-sparql-2.0-dev': '',  # only tracker 3.x is available
+            'cargo': '', # included cargo is broken
         }
     },
     'ubuntu1804': {
diff --git a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
index fa731aac174..1781cd75b19 100755
--- a/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11-32bit/bootstrap.sh
@@ -19,7 +19,6 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
-    cargo \
     ccache \
     chrpath \
     codespell \
diff --git a/bootstrap/generated-dists/debian11-32bit/packages.yml b/bootstrap/generated-dists/debian11-32bit/packages.yml
index 63d5f41e064..1484203648a 100644
--- a/bootstrap/generated-dists/debian11-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian11-32bit/packages.yml
@@ -8,7 +8,6 @@ packages:
   - binutils
   - bison
   - build-essential
-  - cargo
   - ccache
   - chrpath
   - codespell
diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh
index fa731aac174..1781cd75b19 100755
--- a/bootstrap/generated-dists/debian11/bootstrap.sh
+++ b/bootstrap/generated-dists/debian11/bootstrap.sh
@@ -19,7 +19,6 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
-    cargo \
     ccache \
     chrpath \
     codespell \
diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml
index 63d5f41e064..1484203648a 100644
--- a/bootstrap/generated-dists/debian11/packages.yml
+++ b/bootstrap/generated-dists/debian11/packages.yml
@@ -8,7 +8,6 @@ packages:
   - binutils
   - bison
   - build-essential
-  - cargo
   - ccache
   - chrpath
   - codespell
diff --git a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
index eea84b95ba6..6367f8fa4a0 100755
--- a/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12-32bit/bootstrap.sh
@@ -19,7 +19,6 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
-    cargo \
     ccache \
     chrpath \
     codespell \
diff --git a/bootstrap/generated-dists/debian12-32bit/packages.yml b/bootstrap/generated-dists/debian12-32bit/packages.yml
index 6191eb9c2aa..0c29da53999 100644
--- a/bootstrap/generated-dists/debian12-32bit/packages.yml
+++ b/bootstrap/generated-dists/debian12-32bit/packages.yml
@@ -8,7 +8,6 @@ packages:
   - binutils
   - bison
   - build-essential
-  - cargo
   - ccache
   - chrpath
   - codespell
diff --git a/bootstrap/generated-dists/debian12/bootstrap.sh b/bootstrap/generated-dists/debian12/bootstrap.sh
index eea84b95ba6..6367f8fa4a0 100755
--- a/bootstrap/generated-dists/debian12/bootstrap.sh
+++ b/bootstrap/generated-dists/debian12/bootstrap.sh
@@ -19,7 +19,6 @@ apt-get -y install \
     binutils \
     bison \
     build-essential \
-    cargo \
     ccache \
     chrpath \
     codespell \
diff --git a/bootstrap/generated-dists/debian12/packages.yml b/bootstrap/generated-dists/debian12/packages.yml
index 6191eb9c2aa..0c29da53999 100644
--- a/bootstrap/generated-dists/debian12/packages.yml
+++ b/bootstrap/generated-dists/debian12/packages.yml
@@ -8,7 +8,6 @@ packages:
   - binutils
   - bison
   - build-essential
-  - cargo
   - ccache
   - chrpath
   - codespell
diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt
index 14c14eed45a..5c42c3950cd 100644
--- a/bootstrap/sha1sum.txt
+++ b/bootstrap/sha1sum.txt
@@ -1 +1 @@
-e8921f91497f528c3f07d31e67e48b79dcba3705
+38de01039fd443a1392050bdd4eab6cdc83f2e53