mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
MDEV-39292 Debian build compiles Columnstore aarch64
But doesn't package it. The devel-6 branch of columnstore is in a low maintaince state. We can't readd aarch64. To prevent our CI resources building aarch64 columnstore on the 10.6 and 10.11 branches we adjust our autobake-deb.sh to keep the disable there. The version check to 10 is so that when this is merged to 11.4 it becomes no longer impacting.
This commit is contained in:
committed by
Oleksandr "Sanja" Byelkin
parent
c454ba882b
commit
29453945ba
23
debian/autobake-deb.sh
vendored
23
debian/autobake-deb.sh
vendored
@@ -26,16 +26,19 @@ then
|
||||
sed '/Add support for verbose builds/,/^$/d' -i debian/rules
|
||||
elif [ -d storage/columnstore/columnstore/debian ]
|
||||
then
|
||||
# ColumnStore is explicitly disabled in the native Debian build. Enable it
|
||||
# now when build is triggered by autobake-deb.sh (MariaDB.org) and when the
|
||||
# build is not running on Gitlab-CI.
|
||||
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
|
||||
# Take the files and part of control from MCS directory
|
||||
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
|
||||
# idempotent, except for the blank line, but that can be tolerated.
|
||||
sed -e '/Package: mariadb-plugin-columnstore/,/^$/d' -i debian/control
|
||||
echo >> debian/control
|
||||
cat storage/columnstore/columnstore/debian/control >> debian/control
|
||||
if [ "${MYSQL_VERSION_MAJOR:-not10}" != "10" ] || [ "$architecture" = amd64 ]
|
||||
then
|
||||
# ColumnStore is explicitly disabled in the native Debian build. Enable it
|
||||
# now when build is triggered by autobake-deb.sh (MariaDB.org) and when the
|
||||
# build is not running on Gitlab-CI.
|
||||
sed '/-DPLUGIN_COLUMNSTORE=NO/d' -i debian/rules
|
||||
# Take the files and part of control from MCS directory
|
||||
cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
|
||||
# idempotent, except for the blank line, but that can be tolerated.
|
||||
sed -e '/Package: mariadb-plugin-columnstore/,/^$/d' -i debian/control
|
||||
echo >> debian/control
|
||||
cat storage/columnstore/columnstore/debian/control >> debian/control
|
||||
fi
|
||||
fi
|
||||
|
||||
# Look up distro-version specific stuff
|
||||
|
||||
Reference in New Issue
Block a user