[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Sat Feb 15 11:38:02 UTC 2020
The branch, master has been updated
via 195e88cea34 s3:modules: add vfs_io_uring module
via fb5a99fa020 bootstrap: replace libaio-dev/libaio-devel with liburing-dev/liburing-devel
via c1b9bf99340 lib/replace: remove unused check for aio.h
from b9ab8bf7a9c s3:tests: Add smbclient test for 'force create mode = 0664'
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 195e88cea34c983afc02cfb521a60cdd1edbe9e1
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed Jun 5 17:01:49 2019 +0200
s3:modules: add vfs_io_uring module
The module makes use of the new io_uring infrastructure
(intruduced in linux 5.1), see https://lwn.net/Articles/778411/ and
http://git.kernel.dk/cgit/liburing/
Currently this only implements SMB_VFS_{PREAD,PWRITE,FSYNC}_SEND/RECV
and avoids the overhead of our userspace threadpool.
In future we'll hopefully make more use of more advanced io_uring
features.
For now we don't have automated tests as our test infrastructure
doesn't use a recent kernel. At least we're able to do compile tests
on fedora31.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Sat Feb 15 11:37:45 UTC 2020 on sn-devel-184
commit fb5a99fa0200785ef1b5a8c9bc4a645d09fbeb5e
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Feb 7 11:00:21 2020 +0100
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 at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
commit c1b9bf993402f7d74f992c609ede94653e87172f
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Feb 7 11:02:18 2020 +0100
lib/replace: remove unused check for aio.h
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 2 +-
bootstrap/config.py | 18 +-
bootstrap/generated-dists/centos6/bootstrap.sh | 1 -
bootstrap/generated-dists/centos6/packages.yml | 1 -
bootstrap/generated-dists/centos7/bootstrap.sh | 1 -
bootstrap/generated-dists/centos7/packages.yml | 1 -
bootstrap/generated-dists/centos8/bootstrap.sh | 1 -
bootstrap/generated-dists/centos8/packages.yml | 1 -
bootstrap/generated-dists/debian10/bootstrap.sh | 1 -
bootstrap/generated-dists/debian10/packages.yml | 1 -
bootstrap/generated-dists/debian7/bootstrap.sh | 1 -
bootstrap/generated-dists/debian7/packages.yml | 1 -
bootstrap/generated-dists/debian8/bootstrap.sh | 1 -
bootstrap/generated-dists/debian8/packages.yml | 1 -
bootstrap/generated-dists/debian9/bootstrap.sh | 1 -
bootstrap/generated-dists/debian9/packages.yml | 1 -
bootstrap/generated-dists/fedora29/bootstrap.sh | 1 -
bootstrap/generated-dists/fedora29/packages.yml | 1 -
bootstrap/generated-dists/fedora30/bootstrap.sh | 1 -
bootstrap/generated-dists/fedora30/packages.yml | 1 -
bootstrap/generated-dists/fedora31/bootstrap.sh | 2 +-
bootstrap/generated-dists/fedora31/packages.yml | 2 +-
bootstrap/generated-dists/opensuse150/bootstrap.sh | 1 -
bootstrap/generated-dists/opensuse150/packages.yml | 1 -
bootstrap/generated-dists/opensuse151/bootstrap.sh | 1 -
bootstrap/generated-dists/opensuse151/packages.yml | 1 -
bootstrap/generated-dists/ubuntu1404/bootstrap.sh | 1 -
bootstrap/generated-dists/ubuntu1404/packages.yml | 1 -
bootstrap/generated-dists/ubuntu1604/bootstrap.sh | 1 -
bootstrap/generated-dists/ubuntu1604/packages.yml | 1 -
bootstrap/generated-dists/ubuntu1804/bootstrap.sh | 1 -
bootstrap/generated-dists/ubuntu1804/packages.yml | 1 -
bootstrap/sha1sum.txt | 2 +-
.../{vfs_aio_pthread.8.xml => vfs_io_uring.8.xml} | 54 +-
docs-xml/wscript_build | 1 +
lib/replace/wscript | 2 +-
source3/modules/vfs_io_uring.c | 543 +++++++++++++++++++++
source3/modules/wscript_build | 8 +
source3/wscript | 11 +
39 files changed, 617 insertions(+), 56 deletions(-)
copy docs-xml/manpages/{vfs_aio_pthread.8.xml => vfs_io_uring.8.xml} (55%)
create mode 100644 source3/modules/vfs_io_uring.c
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index df91d7dadb1..56adf10c7be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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.
diff --git a/bootstrap/config.py b/bootstrap/config.py
index ecead21da29..bcada1dc628 100644
--- a/bootstrap/config.py
+++ b/bootstrap/config.py
@@ -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
}
}
}
diff --git a/bootstrap/generated-dists/centos6/bootstrap.sh b/bootstrap/generated-dists/centos6/bootstrap.sh
index b1fb2536fa9..ee6fcc33799 100755
--- a/bootstrap/generated-dists/centos6/bootstrap.sh
+++ b/bootstrap/generated-dists/centos6/bootstrap.sh
@@ -46,7 +46,6 @@ yum install -y \
krb5-server \
lcov \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/centos6/packages.yml b/bootstrap/generated-dists/centos6/packages.yml
index cba40f3b93d..1e2b5a98fa6 100644
--- a/bootstrap/generated-dists/centos6/packages.yml
+++ b/bootstrap/generated-dists/centos6/packages.yml
@@ -32,7 +32,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/centos7/bootstrap.sh b/bootstrap/generated-dists/centos7/bootstrap.sh
index f97c77d2a6b..2f0bb1bcc28 100755
--- a/bootstrap/generated-dists/centos7/bootstrap.sh
+++ b/bootstrap/generated-dists/centos7/bootstrap.sh
@@ -46,7 +46,6 @@ yum install -y \
krb5-server \
lcov \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/centos7/packages.yml b/bootstrap/generated-dists/centos7/packages.yml
index 87efa4330d1..475326b6db7 100644
--- a/bootstrap/generated-dists/centos7/packages.yml
+++ b/bootstrap/generated-dists/centos7/packages.yml
@@ -32,7 +32,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/centos8/bootstrap.sh b/bootstrap/generated-dists/centos8/bootstrap.sh
index e19a8b169c7..22484b3f6ad 100755
--- a/bootstrap/generated-dists/centos8/bootstrap.sh
+++ b/bootstrap/generated-dists/centos8/bootstrap.sh
@@ -49,7 +49,6 @@ yum install -y \
krb5-devel \
krb5-server \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/centos8/packages.yml b/bootstrap/generated-dists/centos8/packages.yml
index a86bbbdc620..07be0deeceb 100644
--- a/bootstrap/generated-dists/centos8/packages.yml
+++ b/bootstrap/generated-dists/centos8/packages.yml
@@ -34,7 +34,6 @@ packages:
- krb5-devel
- krb5-server
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/debian10/bootstrap.sh b/bootstrap/generated-dists/debian10/bootstrap.sh
index eb610c5ee79..f0847eb3c20 100755
--- a/bootstrap/generated-dists/debian10/bootstrap.sh
+++ b/bootstrap/generated-dists/debian10/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian10/packages.yml b/bootstrap/generated-dists/debian10/packages.yml
index 8440e143f62..a242cd8b362 100644
--- a/bootstrap/generated-dists/debian10/packages.yml
+++ b/bootstrap/generated-dists/debian10/packages.yml
@@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- - libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
diff --git a/bootstrap/generated-dists/debian7/bootstrap.sh b/bootstrap/generated-dists/debian7/bootstrap.sh
index ea8a9ad8afc..daedce84fd9 100755
--- a/bootstrap/generated-dists/debian7/bootstrap.sh
+++ b/bootstrap/generated-dists/debian7/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian7/packages.yml b/bootstrap/generated-dists/debian7/packages.yml
index e531b5822ed..3cac6870b3e 100644
--- a/bootstrap/generated-dists/debian7/packages.yml
+++ b/bootstrap/generated-dists/debian7/packages.yml
@@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- - libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
diff --git a/bootstrap/generated-dists/debian8/bootstrap.sh b/bootstrap/generated-dists/debian8/bootstrap.sh
index 6c720adcd1a..010508360ed 100755
--- a/bootstrap/generated-dists/debian8/bootstrap.sh
+++ b/bootstrap/generated-dists/debian8/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian8/packages.yml b/bootstrap/generated-dists/debian8/packages.yml
index 53052141cf5..1c9552b85f3 100644
--- a/bootstrap/generated-dists/debian8/packages.yml
+++ b/bootstrap/generated-dists/debian8/packages.yml
@@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- - libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
diff --git a/bootstrap/generated-dists/debian9/bootstrap.sh b/bootstrap/generated-dists/debian9/bootstrap.sh
index eb610c5ee79..f0847eb3c20 100755
--- a/bootstrap/generated-dists/debian9/bootstrap.sh
+++ b/bootstrap/generated-dists/debian9/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
krb5-user \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
diff --git a/bootstrap/generated-dists/debian9/packages.yml b/bootstrap/generated-dists/debian9/packages.yml
index 8440e143f62..a242cd8b362 100644
--- a/bootstrap/generated-dists/debian9/packages.yml
+++ b/bootstrap/generated-dists/debian9/packages.yml
@@ -28,7 +28,6 @@ packages:
- krb5-user
- lcov
- libacl1-dev
- - libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
diff --git a/bootstrap/generated-dists/fedora29/bootstrap.sh b/bootstrap/generated-dists/fedora29/bootstrap.sh
index c82c86166e5..effe2a9d214 100755
--- a/bootstrap/generated-dists/fedora29/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora29/bootstrap.sh
@@ -46,7 +46,6 @@ dnf install -y \
krb5-server \
lcov \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/fedora29/packages.yml b/bootstrap/generated-dists/fedora29/packages.yml
index 35aaa53c117..3b767f8ba08 100644
--- a/bootstrap/generated-dists/fedora29/packages.yml
+++ b/bootstrap/generated-dists/fedora29/packages.yml
@@ -35,7 +35,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/fedora30/bootstrap.sh b/bootstrap/generated-dists/fedora30/bootstrap.sh
index c82c86166e5..effe2a9d214 100755
--- a/bootstrap/generated-dists/fedora30/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora30/bootstrap.sh
@@ -46,7 +46,6 @@ dnf install -y \
krb5-server \
lcov \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/fedora30/packages.yml b/bootstrap/generated-dists/fedora30/packages.yml
index 35aaa53c117..3b767f8ba08 100644
--- a/bootstrap/generated-dists/fedora30/packages.yml
+++ b/bootstrap/generated-dists/fedora30/packages.yml
@@ -35,7 +35,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/fedora31/bootstrap.sh b/bootstrap/generated-dists/fedora31/bootstrap.sh
index fd6eecd1ab7..18c58092eff 100755
--- a/bootstrap/generated-dists/fedora31/bootstrap.sh
+++ b/bootstrap/generated-dists/fedora31/bootstrap.sh
@@ -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 \
diff --git a/bootstrap/generated-dists/fedora31/packages.yml b/bootstrap/generated-dists/fedora31/packages.yml
index 8a2e2c785ad..3165af8dd82 100644
--- a/bootstrap/generated-dists/fedora31/packages.yml
+++ b/bootstrap/generated-dists/fedora31/packages.yml
@@ -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
diff --git a/bootstrap/generated-dists/opensuse150/bootstrap.sh b/bootstrap/generated-dists/opensuse150/bootstrap.sh
index 0e229caacb5..3fbcaacb24f 100755
--- a/bootstrap/generated-dists/opensuse150/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse150/bootstrap.sh
@@ -43,7 +43,6 @@ zypper --non-interactive install \
krb5-server \
lcov \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/opensuse150/packages.yml b/bootstrap/generated-dists/opensuse150/packages.yml
index 910f95cf55f..0eb19244677 100644
--- a/bootstrap/generated-dists/opensuse150/packages.yml
+++ b/bootstrap/generated-dists/opensuse150/packages.yml
@@ -31,7 +31,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/opensuse151/bootstrap.sh b/bootstrap/generated-dists/opensuse151/bootstrap.sh
index 0e229caacb5..3fbcaacb24f 100755
--- a/bootstrap/generated-dists/opensuse151/bootstrap.sh
+++ b/bootstrap/generated-dists/opensuse151/bootstrap.sh
@@ -43,7 +43,6 @@ zypper --non-interactive install \
krb5-server \
lcov \
libacl-devel \
- libaio-devel \
libarchive-devel \
libattr-devel \
libblkid-devel \
diff --git a/bootstrap/generated-dists/opensuse151/packages.yml b/bootstrap/generated-dists/opensuse151/packages.yml
index 910f95cf55f..0eb19244677 100644
--- a/bootstrap/generated-dists/opensuse151/packages.yml
+++ b/bootstrap/generated-dists/opensuse151/packages.yml
@@ -31,7 +31,6 @@ packages:
- krb5-server
- lcov
- libacl-devel
- - libaio-devel
- libarchive-devel
- libattr-devel
- libblkid-devel
diff --git a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
index 9c707de566d..78c8969ac69 100755
--- a/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1404/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
language-pack-en \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
diff --git a/bootstrap/generated-dists/ubuntu1404/packages.yml b/bootstrap/generated-dists/ubuntu1404/packages.yml
index f8d2ab8fc4c..f6c8a0aaa00 100644
--- a/bootstrap/generated-dists/ubuntu1404/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1404/packages.yml
@@ -28,7 +28,6 @@ packages:
- language-pack-en
- lcov
- libacl1-dev
- - libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
diff --git a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
index d7540d31a38..a8f47762ded 100755
--- a/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1604/bootstrap.sh
@@ -39,7 +39,6 @@ apt-get -y install \
language-pack-en \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
libattr1-dev \
libavahi-common-dev \
diff --git a/bootstrap/generated-dists/ubuntu1604/packages.yml b/bootstrap/generated-dists/ubuntu1604/packages.yml
index da1c540bf3f..c3cd9af9c3e 100644
--- a/bootstrap/generated-dists/ubuntu1604/packages.yml
+++ b/bootstrap/generated-dists/ubuntu1604/packages.yml
@@ -28,7 +28,6 @@ packages:
- language-pack-en
- lcov
- libacl1-dev
- - libaio-dev
- libarchive-dev
- libattr1-dev
- libavahi-common-dev
diff --git a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
index f0b3e3120d0..97d32815d72 100755
--- a/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
+++ b/bootstrap/generated-dists/ubuntu1804/bootstrap.sh
@@ -40,7 +40,6 @@ apt-get -y install \
language-pack-en \
lcov \
libacl1-dev \
- libaio-dev \
libarchive-dev \
--
Samba Shared Repository
More information about the samba-cvs
mailing list