summaryrefslogtreecommitdiffstats
path: root/debian/rules
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:14 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 13:39:14 +0000
commita569d4096d91a06a40a8dbf4ff4350f664d462bd (patch)
tree7203bcfb59d24f9500b15521eab2f77f024f4791 /debian/rules
parentMerging upstream version 1:10.11.7. (diff)
downloadmariadb-a569d4096d91a06a40a8dbf4ff4350f664d462bd.tar.xz
mariadb-a569d4096d91a06a40a8dbf4ff4350f664d462bd.zip
Merging debian version 1:10.11.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/rules')
-rwxr-xr-xdebian/rules37
1 files changed, 10 insertions, 27 deletions
diff --git a/debian/rules b/debian/rules
index 74516b12..45c74f74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,7 +114,6 @@ endif
-DCOMPILATION_COMMENT="$(DEB_VENDOR) $(RELEASE)" \
-DMYSQL_SERVER_SUFFIX="-$(DEB_VERSION_REVISION)" \
-DSYSTEM_TYPE="debian-$(DEB_HOST_GNU_SYSTEM)" \
- -DCMAKE_SYSTEM_PROCESSOR=$(DEB_HOST_ARCH) \
-DBUILD_CONFIG=mysql_release \
-DCONC_DEFAULT_CHARSET=utf8mb4 \
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \
@@ -160,16 +159,6 @@ override_dh_auto_install:
dh_testdir
dh_testroot
-ifneq (,$(filter linux,$(DEB_HOST_ARCH_OS)))
- # Copy systemd files to a location available for dh_installinit
- cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server.mariadb.service
- cp $(BUILDDIR)/support-files/mariadb.socket debian/mariadb-server.mariadb.socket
- cp $(BUILDDIR)/support-files/mariadb-extra.socket debian/mariadb-server.mariadb-extra.socket
- cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server.mariadb@.service
- cp $(BUILDDIR)/support-files/mariadb@.socket debian/mariadb-server.mariadb@.socket
- cp $(BUILDDIR)/support-files/mariadb-extra@.socket debian/mariadb-server.mariadb-extra@.socket
-endif
-
# Run 'make install' without output since it is uninteresting and
# silencing it helps to make overall build log shorter and more readable
@echo "Running $(MAKE) install DESTDIR=$(TMP) ..."
@@ -178,6 +167,11 @@ endif
# If mariadb-test package is removed, also remove most of it's files
grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test
+ # Delete lone compiled binary that that does not belong in the
+ # mariadb-test-data package and which seems hard to move
+ # https://jira.mariadb.org/browse/MDEV-21654
+ rm -rf $(TMP)/usr/share/mysql/mysql-test/suite/plugins/pam/pam_mariadb_mtr.so
+
# Delete private files from libraries so they don't get shipped in the -dev packages
rm -r $(TMP)/usr/include/mariadb/server/private
@@ -210,22 +204,11 @@ endif
# Move test plugins that are only needed by the client to the libmariadb path
mv -v $(TMP)/usr/lib/mysql/plugin/qa_auth_client.so $(TMP)/usr/lib/$(DEB_HOST_MULTIARCH)/libmariadb3/plugin/
-# Install mariadb.socket without enabling it, keep using mariadb.service by default
-# @TODO: Temporarily disable extra and socket systemd file installation until
-# a '--build=all' compatible mechanism is found
-override_dh_systemd_enable:
- dh_systemd_enable --name=mariadb
- dh_systemd_enable --no-enable --name=mariadb@ # mariadb@.service
-# dh_systemd_enable --no-enable --name=mariadb mariadb.socket
-# dh_systemd_enable --no-enable --name=mariadb-extra mariadb-extra.socket
-# dh_systemd_enable --no-enable --name=mariadb@ mariadb.socket
-# dh_systemd_enable --no-enable --name=mariadb-extra@ mariadb-extra.socket
-
-# Start mariadbd at sequence number 19 before 20 where apache, proftpd etc gets
-# started which might depend on a running database server.
+override_dh_installsystemd:
+ dh_installsystemd -pmariadb-server mariadb.service
+
override_dh_installinit-arch:
- dh_installinit --name=mariadb --no-start -- defaults 19 21
- dh_systemd_start --restart-after-upgrade
+ dh_installinit --name=mariadb
# Use custom server version string variable
override_dh_gencontrol:
@@ -236,6 +219,6 @@ override_dh_gencontrol:
# white list file only starting from Debian Stretch and Ubuntu Xenial.
# To find more, grep build logs for 'but is not installed to anywhere'.
%:
- dh $@ --fail-missing
+ dh $@
# vim: ts=8