revision-id: 80c17fb3a842fa68df0d69e10e16da853de3a872 (mariadb-10.3.6-142-g80c17fb3a84) parent(s): 0e186837c6b67214174d8f3ed98ef2e2f2f86ddb a40de1bdeb218d66d5cc737758a4bab1b06f255d author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-02-20 17:25:11 +0100 message: Merge branch '10.3' into 10.4 debian/autobake-deb.sh | 27 ---------------------- .../mariabackup/encrypted_page_compressed.test | 2 +- .../mariabackup/encrypted_page_corruption.test | 2 +- .../suite/mariabackup/log_checksum_mismatch.test | 2 +- .../mariabackup/unencrypted_page_compressed.test | 2 +- 5 files changed, 4 insertions(+), 31 deletions(-) diff --cc debian/autobake-deb.sh index 3442afbf376,5ca59e0305d..6ef0cb33553 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@@ -94,36 -94,9 +94,9 @@@ f # x86 32 bit. if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]] then - sed '/Package: mariadb-plugin-rocksdb/,+14d' -i debian/control + sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control fi - # AWS SDK requires c++11 -capable compiler. - # Minimal supported versions are g++ 4.8 and clang 3.3. - # AWS SDK also requires the build machine to have network access and git, so - # it cannot be part of the base version included in Linux distros, but a pure - # custom built plugin. - if [[ $GCCVERSION -gt 40800 ]] && [[ ! $TRAVIS ]] && [[ -x "$(command -v git)" ]] && timeout 3s bash -c 'sed -n q </dev/tcp/github.com/22' - then - cat <<EOF >> debian/control - - Package: mariadb-plugin-aws-key-management - Architecture: any - Breaks: mariadb-aws-key-management-10.1, - mariadb-aws-key-management-10.2 - Replaces: mariadb-aws-key-management-10.1, - mariadb-aws-key-management-10.2 - Depends: mariadb-server-10.4, - \${misc:Depends}, - \${shlibs:Depends} - Description: Amazon Web Service Key Management Service Plugin for MariaDB - This encryption key management plugin gives an interface to the Amazon Web - Services Key Management Service for managing encryption keys used for MariaDB - data-at-rest encryption. - EOF - - sed -i -e "/-DPLUGIN_AWS_KEY_MANAGEMENT=NO/d" debian/rules - fi - # Don't build cassandra package if thrift is not installed if [[ ! -f /usr/local/include/thrift/Thrift.h && ! -f /usr/include/thrift/Thrift.h ]] then