diff options
Diffstat (limited to 'debian/autobake-deb.sh')
| -rwxr-xr-x | debian/autobake-deb.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index ac2f1395dcd..687f2356153 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -24,8 +24,8 @@ then sed -i -e '/Add support for verbose builds/,+2d' debian/rules # Don't include test suite package on Travis-CI to make the build time shorter - sed '/Package: mariadb-test-data/,+26d' -i debian/control - sed '/Package: mariadb-test/,+34d' -i debian/control + sed '/Package: mariadb-test-data/,/^$/d' -i debian/control + sed '/Package: mariadb-test/,/^$/d' -i debian/control fi @@ -47,7 +47,7 @@ fi if ! apt-cache madison libcrack2-dev | grep 'libcrack2-dev *| *2\.9' >/dev/null 2>&1 then sed '/libcrack2-dev/d' -i debian/control - sed '/Package: mariadb-plugin-cracklib/,+9d' -i debian/control + sed '/Package: mariadb-plugin-cracklib/,/^$/d' -i debian/control fi # If libpcre3-dev (>= 2:8.35-3.2~) is not available (before Debian Jessie or Ubuntu Wily) @@ -82,13 +82,12 @@ GCCVERSION=$(gcc -dumpfullversion -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g # x86 32 bit. if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] then - sed '/Package: mariadb-plugin-rocksdb/,+10d' -i debian/control -fi -if [[ $GCCVERSION -lt 40800 ]] -then - sed '/Package: mariadb-plugin-aws-key-management-10.2/,+12d' -i debian/control + 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 @@ -104,7 +103,8 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${ PATCHLEVEL="+maria" LOGSTRING="MariaDB build" CODENAME="$(lsb_release -sc)" -if [[ "$CODENAME" == bionic ]]; then +VERNUM="$(lsb_release -sr)" +if [[ "${VERNUM%.*}" -ge 18 ]]; then EPOCH="1:" fi |