From 04f188f4d573f0138b75f26d1c18d98329a3446e Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 19 Oct 2021 11:00:22 +1100 Subject: [PATCH] bootstrap: Debian 11 has liburing-dev BUG: https://bugzilla.samba.org/show_bug.cgi?id=14872 Signed-off-by: Martin Schwenke Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Tue Oct 19 09:14:10 UTC 2021 on sn-devel-184 --- .gitlab-ci-main.yml | 2 +- bootstrap/config.py | 1 - bootstrap/generated-dists/debian11/bootstrap.sh | 1 + bootstrap/generated-dists/debian11/packages.yml | 1 + bootstrap/sha1sum.txt | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml index ba8de6c22fe..cc48ec12a64 100644 --- a/.gitlab-ci-main.yml +++ b/.gitlab-ci-main.yml @@ -42,7 +42,7 @@ variables: # Set this to the contents of bootstrap/sha1sum.txt # which is generated by bootstrap/template.py --render # - SAMBA_CI_CONTAINER_TAG: 8d90789fe49d9003a7e5c66b1a00639bcce1238f + SAMBA_CI_CONTAINER_TAG: dd885c72c8615e2d6166a04f3709d9ceaa728f84 # # 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 c98ece513ec..2cf754782a1 100644 --- a/bootstrap/config.py +++ b/bootstrap/config.py @@ -404,7 +404,6 @@ DEB_DISTS = { 'vagrant_box': 'debian/bullseye64', 'replace': { 'language-pack-en': '', # included in locales - 'liburing-dev': '', # not available } }, 'ubuntu1804': { diff --git a/bootstrap/generated-dists/debian11/bootstrap.sh b/bootstrap/generated-dists/debian11/bootstrap.sh index 84f5f6855b7..07d6209c072 100755 --- a/bootstrap/generated-dists/debian11/bootstrap.sh +++ b/bootstrap/generated-dists/debian11/bootstrap.sh @@ -70,6 +70,7 @@ apt-get -y install \ libtasn1-dev \ libtracker-sparql-2.0-dev \ libunwind-dev \ + liburing-dev \ lmdb-utils \ locales \ lsb-release \ diff --git a/bootstrap/generated-dists/debian11/packages.yml b/bootstrap/generated-dists/debian11/packages.yml index 32f37eeb013..6d3c2385339 100644 --- a/bootstrap/generated-dists/debian11/packages.yml +++ b/bootstrap/generated-dists/debian11/packages.yml @@ -59,6 +59,7 @@ packages: - libtasn1-dev - libtracker-sparql-2.0-dev - libunwind-dev + - liburing-dev - lmdb-utils - locales - lsb-release diff --git a/bootstrap/sha1sum.txt b/bootstrap/sha1sum.txt index a9996ecf27d..60a3cced99c 100644 --- a/bootstrap/sha1sum.txt +++ b/bootstrap/sha1sum.txt @@ -1 +1 @@ -8d90789fe49d9003a7e5c66b1a00639bcce1238f +dd885c72c8615e2d6166a04f3709d9ceaa728f84 -- 2.34.1