diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-06 09:00:52 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-03-06 09:00:52 +0200 |
commit | 2a791c53ad93c8bc1441dd227000234bd49c4990 (patch) | |
tree | 4c52ad715c99bd3c6681771d7cb77d451a34e216 /debian/autobake-deb.sh | |
parent | b5c72a843abee033e9ea6028e1a109f03afc4455 (diff) | |
parent | 723ffdb32ee785cbc511abc457eb70d41c2fcce3 (diff) | |
download | mariadb-git-2a791c53ad93c8bc1441dd227000234bd49c4990.tar.gz |
Merge 10.3 into 10.4
Diffstat (limited to 'debian/autobake-deb.sh')
-rwxr-xr-x | debian/autobake-deb.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 6ef0cb33553..7d2301c7369 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -97,6 +97,9 @@ then sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control fi +# Always remove aws plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt +sed '/Package: mariadb-plugin-aws-key-management-10.2/,/^$/d' -i debian/control + # 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 |