bootstrap: replace libaio-dev/libaio-devel with liburing-dev/liburing-devel
authorStefan Metzmacher <metze@samba.org>
Fri, 7 Feb 2020 10:00:21 +0000 (11:00 +0100)
committerStefan Metzmacher <metze@samba.org>
Sat, 15 Feb 2020 10:11:28 +0000 (10:11 +0000)
We'll never use libaio, but will soon add a io_uring vfs module.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
33 files changed:
.gitlab-ci.yml
bootstrap/config.py
bootstrap/generated-dists/centos6/bootstrap.sh
bootstrap/generated-dists/centos6/packages.yml
bootstrap/generated-dists/centos7/bootstrap.sh
bootstrap/generated-dists/centos7/packages.yml
bootstrap/generated-dists/centos8/bootstrap.sh
bootstrap/generated-dists/centos8/packages.yml
bootstrap/generated-dists/debian10/bootstrap.sh
bootstrap/generated-dists/debian10/packages.yml
bootstrap/generated-dists/debian7/bootstrap.sh
bootstrap/generated-dists/debian7/packages.yml
bootstrap/generated-dists/debian8/bootstrap.sh
bootstrap/generated-dists/debian8/packages.yml
bootstrap/generated-dists/debian9/bootstrap.sh
bootstrap/generated-dists/debian9/packages.yml
bootstrap/generated-dists/fedora29/bootstrap.sh
bootstrap/generated-dists/fedora29/packages.yml
bootstrap/generated-dists/fedora30/bootstrap.sh
bootstrap/generated-dists/fedora30/packages.yml
bootstrap/generated-dists/fedora31/bootstrap.sh
bootstrap/generated-dists/fedora31/packages.yml
bootstrap/generated-dists/opensuse150/bootstrap.sh
bootstrap/generated-dists/opensuse150/packages.yml
bootstrap/generated-dists/opensuse151/bootstrap.sh
bootstrap/generated-dists/opensuse151/packages.yml
bootstrap/generated-dists/ubuntu1404/bootstrap.sh
bootstrap/generated-dists/ubuntu1404/packages.yml
bootstrap/generated-dists/ubuntu1604/bootstrap.sh
bootstrap/generated-dists/ubuntu1604/packages.yml
bootstrap/generated-dists/ubuntu1804/bootstrap.sh
bootstrap/generated-dists/ubuntu1804/packages.yml
bootstrap/sha1sum.txt

index df91d7dadb19322a9f1b03153a42f71a5d2e903a..56adf10c7be6d5d92bf4ae933041c8222a8019ac 100644 (file)
@@ -22,7 +22,7 @@ variables:
   # Set this to the contents of bootstrap/sha1sum.txt
   # which is generated by bootstrap/template.py --render
   #
-  SAMBA_CI_CONTAINER_TAG: cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad
+  SAMBA_CI_CONTAINER_TAG: 41319f2580c026f66b2750604a0eb15d6b6f7b50
   #
   # We use the ubuntu1804 image as default as
   # it matches what we have on sn-devel-184.
index ecead21da29ae7c76ff2dccdacb9e447ee8a7271..bcada1dc6286fed4c22533ab82aca88c112b5473 100644 (file)
@@ -69,7 +69,7 @@ PKGS = [
     ('mingw-w64', 'mingw64-gcc'),
     ('zlib1g-dev', 'zlib-devel'),
     ('libbsd-dev', 'libbsd-devel'),
-    ('libaio-dev', 'libaio-devel'),
+    ('liburing-dev', 'liburing-devel'),
     ('libarchive-dev', 'libarchive-devel'),
     ('libblkid-dev', 'libblkid-devel'),
     ('libcap-dev', 'libcap-devel'),
@@ -385,6 +385,7 @@ DEB_DISTS = {
             'python-gpg': 'python-gpgme',
             'python3-gpg': '',  # no python3 gpg pkg available, remove
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'debian8': {
@@ -394,6 +395,7 @@ DEB_DISTS = {
             'python-gpg': 'python-gpgme',
             'python3-gpg': 'python3-gpgme',
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'debian9': {
@@ -401,6 +403,7 @@ DEB_DISTS = {
         'vagrant_box': 'debian/stretch64',
         'replace': {
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'debian10': {
@@ -408,6 +411,7 @@ DEB_DISTS = {
         'vagrant_box': 'debian/buster64',
         'replace': {
             'language-pack-en': '',   # included in locales
+            'liburing-dev': '',   # not available
         }
     },
     'ubuntu1404': {
@@ -423,6 +427,7 @@ DEB_DISTS = {
             'libunwind-dev': 'libunwind8-dev',
             'glusterfs-common': '',
             'libcephfs-dev': '',
+            'liburing-dev': '',   # not available
         }
     },
     'ubuntu1604': {
@@ -433,11 +438,15 @@ DEB_DISTS = {
             'python3-gpg': 'python3-gpgme',
             'glusterfs-common': '',
             'libcephfs-dev': '',
+            'liburing-dev': '',   # not available
         }
     },
     'ubuntu1804': {
         'docker_image': 'ubuntu:18.04',
         'vagrant_box': 'ubuntu/bionic64',
+        'replace': {
+            'liburing-dev': '',   # not available
+        }
     },
 }
 
@@ -464,6 +473,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'glusterfs-devel': '',
             'libcephfs-devel': '',
+            'liburing-devel': '',   # not available
         }
     },
     'centos7': {
@@ -495,6 +505,7 @@ RPM_DISTS = {
             'glusterfs-devel': '',
             'libcephfs-devel': '',
             'gnutls-devel': 'compat-gnutls34-devel',
+            'liburing-devel': '',   # not available
         }
     },
     'centos8': {
@@ -511,6 +522,7 @@ RPM_DISTS = {
             'policycoreutils-python': 'python3-policycoreutils',
             'python3-crypto': '',
             'quota-devel': '', # FIXME: Add me back, once available!
+            'liburing-devel': '', # not available yet, Add me back, once available!
         }
     },
     'fedora29': {
@@ -519,6 +531,7 @@ RPM_DISTS = {
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
+            'liburing-devel': '',   # not available
         }
     },
     'fedora30': {
@@ -527,6 +540,7 @@ RPM_DISTS = {
         'bootstrap': DNF_BOOTSTRAP,
         'replace': {
             'lsb-release': 'redhat-lsb',
+            'liburing-devel': '',   # not available
         }
     },
     'fedora31': {
@@ -569,6 +583,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mingw64-gcc': '', # doesn't exist
+            'liburing-devel': '',   # not available
         }
     },
     'opensuse151': {
@@ -601,6 +616,7 @@ RPM_DISTS = {
             'glusterfs-api-devel': '',
             'libtasn1-tools': '', # asn1Parser is part of libtasn1
             'mingw64-gcc': '', # doesn't exist
+            'liburing-devel': '',   # not available, will be added in 15.2
         }
     }
 }
index b1fb2536fa902a02a86f8522be676569769173f0..ee6fcc337996b9f8038ccb6114aaff26f330603b 100755 (executable)
@@ -46,7 +46,6 @@ yum install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index cba40f3b93d988aad6c850848e583961e7d963e1..1e2b5a98fa6f4e57a01b83636101ecd98fc9109f 100644 (file)
@@ -32,7 +32,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index f97c77d2a6bc105353071e32e7b7aaa31f3c59f0..2f0bb1bcc2827f155bafdef1c6ac72c1805d0128 100755 (executable)
@@ -46,7 +46,6 @@ yum install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index 87efa4330d1be49c05bc0f1c3708c0e60980c07b..475326b6db712825c56c7dcf2e3db587e81faf89 100644 (file)
@@ -32,7 +32,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index e19a8b169c7682e8cb36d4edf3265e363ee18974..22484b3f6ada8ecc194a44fec8a92f16a2bbd01b 100755 (executable)
@@ -49,7 +49,6 @@ yum install -y \
     krb5-devel \
     krb5-server \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index a86bbbdc6204d5ee63433941e75b5617a082432d..07be0deeceb3e4cbeb6e63fb766462c9aaba02e3 100644 (file)
@@ -34,7 +34,6 @@ packages:
   - krb5-devel
   - krb5-server
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index eb610c5ee79f409dba7121efef59274a24d9ea9f..f0847eb3c20bd81f9bcc4d7c18442f196bbeaa32 100755 (executable)
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index 8440e143f620ecc854b4d28b5c8dcc6494ae958f..a242cd8b362c53b562904e07652484a2c3f3c29c 100644 (file)
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index ea8a9ad8afcf9ef31127f83227279f48b02f8f3e..daedce84fd9798bbf4593c0d7253b498a2e4273e 100755 (executable)
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index e531b5822ed3f60bd2537c3e101b5c62d330dd01..3cac6870b3e034c9c645422eb5c6eb57e5dd2d54 100644 (file)
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index 6c720adcd1ac783e485c422fa83e277ff206f0c4..010508360eda7e439874a337bd0124d048a0faf6 100755 (executable)
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index 53052141cf5d4df120ed2237a12fa39d74ee6b00..1c9552b85f3b8eb5b2f03623f95c07a52aae69df 100644 (file)
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index eb610c5ee79f409dba7121efef59274a24d9ea9f..f0847eb3c20bd81f9bcc4d7c18442f196bbeaa32 100755 (executable)
@@ -39,7 +39,6 @@ apt-get -y install \
     krb5-user \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index 8440e143f620ecc854b4d28b5c8dcc6494ae958f..a242cd8b362c53b562904e07652484a2c3f3c29c 100644 (file)
@@ -28,7 +28,6 @@ packages:
   - krb5-user
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index c82c86166e5d3e76022cc43b227279cb08172687..effe2a9d214584faedb4a1486deaae6beb646310 100755 (executable)
@@ -46,7 +46,6 @@ dnf install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index 35aaa53c1179143384cbf39a5a07fcebde727fd9..3b767f8ba08216dfad8c34f0203eae44a32c30dc 100644 (file)
@@ -35,7 +35,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index c82c86166e5d3e76022cc43b227279cb08172687..effe2a9d214584faedb4a1486deaae6beb646310 100755 (executable)
@@ -46,7 +46,6 @@ dnf install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index 35aaa53c1179143384cbf39a5a07fcebde727fd9..3b767f8ba08216dfad8c34f0203eae44a32c30dc 100644 (file)
@@ -35,7 +35,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index fd6eecd1ab7d6f538edfb5ee8e9179d274d16272..18c58092effda2e0add286ae3174704d09bdc2de 100755 (executable)
@@ -46,7 +46,6 @@ dnf install -y \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
@@ -60,6 +59,7 @@ dnf install -y \
     libtasn1-tools \
     libtirpc-devel \
     libunwind-devel \
+    liburing-devel \
     libuuid-devel \
     libxslt \
     lmdb \
index 8a2e2c785ad4f4a11e58dd57689bb1e8d0a3a745..3165af8dd825535fd7f34001a364d2d7da7240de 100644 (file)
@@ -35,7 +35,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
@@ -49,6 +48,7 @@ packages:
   - libtasn1-tools
   - libtirpc-devel
   - libunwind-devel
+  - liburing-devel
   - libuuid-devel
   - libxslt
   - lmdb
index 0e229caacb5adddbcb5227915bd97f491f5e7387..3fbcaacb24fe712011ca818513eaf7b0087b52f2 100755 (executable)
@@ -43,7 +43,6 @@ zypper --non-interactive install \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index 910f95cf55fc6cba984f3d15bc42e0a398398c13..0eb192446777a786722449315e0b9b1aa73d3bee 100644 (file)
@@ -31,7 +31,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index 0e229caacb5adddbcb5227915bd97f491f5e7387..3fbcaacb24fe712011ca818513eaf7b0087b52f2 100755 (executable)
@@ -43,7 +43,6 @@ zypper --non-interactive install \
     krb5-server \
     lcov \
     libacl-devel \
-    libaio-devel \
     libarchive-devel \
     libattr-devel \
     libblkid-devel \
index 910f95cf55fc6cba984f3d15bc42e0a398398c13..0eb192446777a786722449315e0b9b1aa73d3bee 100644 (file)
@@ -31,7 +31,6 @@ packages:
   - krb5-server
   - lcov
   - libacl-devel
-  - libaio-devel
   - libarchive-devel
   - libattr-devel
   - libblkid-devel
index 9c707de566d4d321f6e469e20d7a8c6b04e7baa8..78c8969ac69fd745662a1ea9ffc550e6fb7b9846 100755 (executable)
@@ -39,7 +39,6 @@ apt-get -y install \
     language-pack-en \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index f8d2ab8fc4c3de7ea0b0f71f5831b3291d6d18e9..f6c8a0aaa0057a59f6dfcdfcda071c624fb7b520 100644 (file)
@@ -28,7 +28,6 @@ packages:
   - language-pack-en
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index d7540d31a386145dc90f6dca7bec1b30c31d4495..a8f47762dedd8147f37f2906915233a8dacb56e9 100755 (executable)
@@ -39,7 +39,6 @@ apt-get -y install \
     language-pack-en \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index da1c540bf3f4e6730e8788ddf35bdd3ab0512e4a..c3cd9af9c3e1f514575a8b43031191a3415a0b90 100644 (file)
@@ -28,7 +28,6 @@ packages:
   - language-pack-en
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index f0b3e3120d010e312a44d644573248f81c675150..97d32815d72c8ae4abd6e270b007bde927925260 100755 (executable)
@@ -40,7 +40,6 @@ apt-get -y install \
     language-pack-en \
     lcov \
     libacl1-dev \
-    libaio-dev \
     libarchive-dev \
     libattr1-dev \
     libavahi-common-dev \
index eda09ec5c7c1c624724f39bde9a3b04ca1509d0e..f45deb2c808414a9c35f6d27b1eeb7c8f55af3f9 100644 (file)
@@ -29,7 +29,6 @@ packages:
   - language-pack-en
   - lcov
   - libacl1-dev
-  - libaio-dev
   - libarchive-dev
   - libattr1-dev
   - libavahi-common-dev
index 5f1e8108f7102fa058fa0b90ad0d334bbd66296b..62c2245564e66c984ebe201bf456cb480e0ed1a1 100644 (file)
@@ -1 +1 @@
-cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad
+41319f2580c026f66b2750604a0eb15d6b6f7b50