From 29453945ba229718aee60d72f9ffc83f105fae25 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 9 Apr 2026 12:18:03 +1000 Subject: [PATCH] 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. --- debian/autobake-deb.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index 3e8dcb68b72..879900e9694 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -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