Commit 7cbde2d0 authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Vicențiu-Marian Ciorbaru

Deb: Misc small fixes and cleanups

- Include binary wsrep_sst_rsync_wan previously omitted.
- Don't build the embedded server. This saves a lot of time and
  around 500 MB of disk space.
- Clean away unused override_dh_installcron. The package does not
  have any *.cron files, so this section is not needed.
- Make mariadb-server run time depend on procps so pgrep works.
  The command pgrep is used in the maintainer scripts of mariadb-server,
  thus we should ensure it is found on the system.
- Include build plugin func_test.so in test package. Don't include yet
  type_test.so since it fails (MDEV-22243).
- Clean away obsolete Lintian overrides.
parent 13ec2ecc
......@@ -31,7 +31,7 @@ then
sed 's|DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test|DINSTALL_MYSQLTESTDIR=false|' -i debian/rules
# Also skip building RocksDB, Mroonga etc to save even more time and disk space
sed 's|-DDEB|-DPLUGIN_MROONGA=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO -WITH_EMBEDDED_SERVER=OFF -DDEB|' -i debian/rules
sed 's|-DDEB|-DPLUGIN_MROONGA=NO -DPLUGIN_ROCKSDB=NO -DPLUGIN_SPIDER=NO -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=NO -DPLUGIN_SPHINX=NO -DDEB|' -i debian/rules
fi
# Convert gcc version to numberical value. Format is Mmmpp where M is Major
......
......@@ -512,6 +512,7 @@ Depends: galera-4 (>=26.4),
mariadb-server-core-10.5 (>= ${binary:Version}),
passwd,
perl (>= 5.6),
procps,
psmisc,
rsync,
socat,
......
......@@ -38,6 +38,7 @@ usr/bin/wsrep_sst_common
usr/bin/wsrep_sst_mariabackup
usr/bin/wsrep_sst_mysqldump
usr/bin/wsrep_sst_rsync
usr/bin/wsrep_sst_rsync_wan
usr/lib/mysql/plugin/auth_ed25519.so
usr/lib/mysql/plugin/auth_pam.so
usr/lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
......@@ -99,5 +100,6 @@ usr/share/man/man1/wsrep_sst_common.1
usr/share/man/man1/wsrep_sst_mariabackup.1
usr/share/man/man1/wsrep_sst_mysqldump.1
usr/share/man/man1/wsrep_sst_rsync.1
usr/share/man/man1/wsrep_sst_rsync_wan.1
usr/share/mysql/errmsg-utf8.txt
usr/share/mysql/wsrep_notify
......@@ -12,6 +12,7 @@ usr/lib/mysql/plugin/daemon_example.ini
usr/lib/mysql/plugin/debug_key_management.so
usr/lib/mysql/plugin/dialog_examples.so
usr/lib/mysql/plugin/example_key_management.so
usr/lib/mysql/plugin/func_test.so
usr/lib/mysql/plugin/ha_example.so
usr/lib/mysql/plugin/ha_test_sql_discovery.so
usr/lib/mysql/plugin/libdaemon_example.so
......
lib/systemd/system/mariadb.service # Installed by rules file
lib/systemd/system/mariadb@.service # Installed by rules file
usr/bin/mysql_config # We already have the MariaDB variant
usr/bin/mysql_embedded # Huge 500 MB file. Not intended for distribution via any disto package.
usr/bin/mytop # Mytop is distributed from a separate source package
usr/bin/sst_dump # Use the one from rocksdb-tools package
usr/lib/sysusers.d/sysusers.conf
......
......@@ -88,6 +88,7 @@ endif
-DWITHOUT_TOKUDB=true \
-DWITHOUT_CASSANDRA=true \
-DPLUGIN_AWS_KEY_MANAGEMENT=NO \
-WITH_EMBEDDED_SERVER=OFF \
-DDEB=$(DEB_VENDOR) ..'
# This is needed, otherwise 'make test' will run before binaries have been built
......@@ -172,8 +173,6 @@ override_dh_installinit-arch:
#dh_installinit --name=mysql -- defaults 19 21
dh_systemd_start --restart-after-upgrade
override_dh_installcron-arch:
dh_installcron --name mysql-server
# If a file is not supposed to be included anywhere, add it to the not-installed
# file and document the reason. Note that dh_install supports the above mentioned
......
# Overridden temporarily to get Salsa-CI pass and not stall other dev work with broken pipeline
python-depends-but-no-python-helper mariadb-plugin-rocksdb
# Upstream fix pending: https://github.com/wolfSSL/wolfssl/pull/2785
source-is-missing extra/wolfssl/wolfssl/doc/formats/html/html_changes/menu.js line length is 679 characters (>512)
# Necessary for drop-in-place-replacement upgrades on mysql-server/-client
......@@ -24,4 +22,3 @@ version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-5
version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-8.0
version-substvar-for-external-package mariadb-client-10.5 -> mysql-client-core-8.0
version-substvar-for-external-package libmariadbd-dev -> libmariadbclient-dev
version-substvar-for-external-package libmariadbd-dev -> libmariadb-dev
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment