1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00

bootstrap: replace libaio-dev/libaio-devel with liburing-dev/liburing-devel

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>
This commit is contained in:
Stefan Metzmacher
2020-02-07 11:00:21 +01:00
parent c1b9bf9934
commit fb5a99fa02
33 changed files with 21 additions and 33 deletions

View 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.

View 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
}
}
}

View File

@ -46,7 +46,6 @@ yum install -y \
krb5-server \
lcov \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -32,7 +32,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -46,7 +46,6 @@ yum install -y \
krb5-server \
lcov \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -32,7 +32,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -49,7 +49,6 @@ yum install -y \
krb5-devel \
krb5-server \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -34,7 +34,6 @@ packages:
- krb5-devel
- krb5-server
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -46,7 +46,6 @@ dnf install -y \
krb5-server \
lcov \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -35,7 +35,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -46,7 +46,6 @@ dnf install -y \
krb5-server \
lcov \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -35,7 +35,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -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 \

View 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

View File

@ -43,7 +43,6 @@ zypper --non-interactive install \
krb5-server \
lcov \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -31,7 +31,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -43,7 +43,6 @@ zypper --non-interactive install \
krb5-server \
lcov \
libacl-devel \
libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \

View File

@ -31,7 +31,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel

View File

@ -39,7 +39,6 @@ apt-get -y install \
language-pack-en \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -28,7 +28,6 @@ packages:
- language-pack-en
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -39,7 +39,6 @@ apt-get -y install \
language-pack-en \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -28,7 +28,6 @@ packages:
- language-pack-en
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -40,7 +40,6 @@ apt-get -y install \
language-pack-en \
lcov \
libacl1-dev \
libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \

View File

@ -29,7 +29,6 @@ packages:
- language-pack-en
- lcov
- libacl1-dev
- libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev

View File

@ -1 +1 @@
cffd3e4d9ad505cbf2b6732d2e3021d60e4159ad
41319f2580c026f66b2750604a0eb15d6b6f7b50