Merge 10.7 into 10.8

5 files changed, 14 insertions, 12 deletions

diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 60532dd8e0b..b7e25abfb56 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -31,9 +31,12 @@ then
   # build is not running on Travis or 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/
-  echo >> debian/control
-  sed "s/10.6/${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}/" <storage/columnstore/columnstore/debian/control >> debian/control
+  if [ ! -f debian/mariadb-plugin-columnstore.install ]
+  then
+    cp -v storage/columnstore/columnstore/debian/mariadb-plugin-columnstore.* debian/
+    echo >> debian/control
+    sed "s/10.6/${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}/" <storage/columnstore/columnstore/debian/control >> debian/control
+  fi
 fi
 
 # Look up distro-version specific stuff
@@ -137,6 +140,11 @@ case "${CODENAME}" in
     exit 1
 esac
 
+if [ -n "${AUTOBAKE_PREP_CONTROL_RULES_ONLY:-}" ]
+then
+  exit 0
+fi
+
 # Adjust changelog, add new version
 echo "Incrementing changelog and starting build scripts"
 
diff --git a/debian/mariadb-server-10.8.postinst b/debian/mariadb-server-10.8.postinst
index 13800b7bce2..93a1e4e8b87 100644
--- a/debian/mariadb-server-10.8.postinst
+++ b/debian/mariadb-server-10.8.postinst
@@ -115,7 +115,7 @@ EOF
     if [ -f "$mysql_datadir"/auto.cnf ] && [ -f "$mysql_datadir"/mysql/user.MYD ] &&
        [ ! lsof -nt "$mysql_datadir"/mysql/user.MYD > /dev/null ] && [ ! -f "$mysql_datadir"/undo_001 ]; then
          echo "UPDATE mysql.user SET plugin='unix_socket' WHERE plugin='auth_socket';" |
-             /usr/sbin/mariadbd --skip-innodb --key_buffer_size=0  --default-storage-engine=MyISAM --bootstrap 2> /dev/null
+             mariadbd --skip-innodb --key_buffer_size=0  --default-storage-engine=MyISAM --bootstrap 2> /dev/null
     fi
 
     # Ensure the existence and right permissions for the database and
diff --git a/debian/rules b/debian/rules
index 67e43276622..3878457c637 100755
--- a/debian/rules
+++ b/debian/rules
@@ -112,7 +112,7 @@ override_dh_auto_build:
 	@echo "RULES.$@"
 	# Print build env info to help debug builds on different platforms
 	dpkg-architecture
-	cd $(BUILDDIR) && $(MAKE)
+	cd $(BUILDDIR) && $(MAKE) --output-sync=target
 
 override_dh_auto_test:
 	@echo "RULES.$@"
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index e377c3b1ae5..2d8dd59c106 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -34,7 +34,7 @@ build:
     - mv ${CCACHE_WORK_DIR} ${CCACHE_TMP_DIR}
     # Run Salsa-CI .build-script equivalent, with extra devscripts so autobake-deb.sh can run 'dch'
     - export CCACHE_DIR=${CCACHE_TMP_DIR}
-    - apt-get update && eatmydata apt-get install --no-install-recommends -y ccache fakeroot build-essential devscripts
+    - apt-get update && eatmydata apt-get install --no-install-recommends -y ccache fakeroot build-essential devscripts lsb-release
     - cd ${WORKING_DIR}/${SOURCE_DIR}
     - eatmydata apt-get build-dep --no-install-recommends -y .
     - update-ccache-symlinks; ccache -z # Zero out ccache counters
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4eb5b830a0f..91b4f531693 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,7 +2,6 @@
 # since package breaks/replaces these but at the same time also provides them
 version-substvar-for-external-package mariadb-client-core-10.8 -> mysql-client-5.5
 version-substvar-for-external-package mariadb-server-10.8 -> mysql-server
-version-substvar-for-external-package mariadb-server-10.8 -> mysql-server
 version-substvar-for-external-package libmariadb-dev -> libmysqlclient-dev
 version-substvar-for-external-package libmariadb-dev -> libmysqld-dev
 version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.5
@@ -10,15 +9,10 @@ version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.6
 version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-5.7
 version-substvar-for-external-package mariadb-server-10.8 -> mysql-client-8.0
 version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.1
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.1
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.5
 version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.5
 version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.6
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.6
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.7
 version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-5.7
 version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-8.0
-version-substvar-for-external-package mariadb-client-10.8 -> mysql-client-core-8.0
 version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
 # ColumnStore not used in Debian, safe to ignore. Reported upstream in https://jira.mariadb.org/browse/MDEV-24124
 source-is-missing storage/columnstore/columnstore/utils/jemalloc/libjemalloc.so.2