Skip to content

Commit 1589cf1

Browse files
committed
Deb: Remove TokuDB from Debian packages while keeping it easy to revert
Related: - https://jira.mariadb.org/browse/MDEV-19780 - https://jira.mariadb.org/browse/MDEV-21944
1 parent 91994b6 commit 1589cf1

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

debian/autobake-deb.sh

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ then
2525
# Don't build the test package at all to save time and disk space
2626
sed 's|DINSTALL_MYSQLTESTDIR=share/mysql/mysql-test|DINSTALL_MYSQLTESTDIR=false|' -i debian/rules
2727

28-
# Also skip building RocksDB and TokuDB to save even more time and disk space
29-
sed 's|-DDEB|-DPLUGIN_TOKUDB=NO -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
28+
# Also skip building RocksDB, Mroonga etc to save even more time and disk space
29+
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
3030
fi
3131

3232
# Convert gcc version to numberical value. Format is Mmmpp where M is Major
@@ -65,32 +65,23 @@ then
6565
sed 's/libcurl4/libcurl3/g' -i debian/control
6666
fi
6767

68-
# The binaries should be fully hardened by default. However TokuDB compilation seems to fail on
69-
# Debian Jessie and older and on Ubuntu Xenial and older with the following error message:
70-
# /usr/bin/ld.bfd.real: /tmp/ccOIwjFo.ltrans0.ltrans.o: relocation R_X86_64_PC32 against symbol
71-
# `toku_product_name_strings' can not be used when making a shared object; recompile with -fPIC
72-
# Therefore we need to disable PIE on those releases using gcc as proxy for detection.
73-
if [[ $GCCVERSION -lt 60000 ]]
74-
then
75-
sed 's/hardening=+all$/hardening=+all,-pie/' -i debian/rules
76-
fi
77-
7868
# Don't build rocksdb package if gcc version is less than 4.8 or we are running on
7969
# x86 32 bit.
8070
if [[ $GCCVERSION -lt 40800 ]] || [[ $(arch) =~ i[346]86 ]] || [[ $TRAVIS ]]
8171
then
8272
sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control
8373
fi
8474

85-
# Always remove aws plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt
75+
# Always remove AWS plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt
8676
sed '/Package: mariadb-plugin-aws-key-management-10.2/,/^$/d' -i debian/control
8777

88-
# Don't build cassandra package if thrift is not installed
78+
# Don't build Cassandra package if Thrift is not installed
8979
if [[ ! -f /usr/local/include/thrift/Thrift.h && ! -f /usr/include/thrift/Thrift.h ]]
9080
then
9181
sed '/Package: mariadb-plugin-cassandra/,/^$/d' -i debian/control
9282
fi
9383

84+
# Don't include TokuDB package as it is not built anymore by default (MDEV-19780)
9485
sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control
9586

9687
# If libpcre2-dev is not available (before Debian Stretch and Ubuntu Xenial)
@@ -100,10 +91,9 @@ then
10091
sed 's/libpcre2-dev/libpcre3-dev/' -i debian/control
10192
fi
10293

103-
# Mroonga, TokuDB never built on Travis CI anyway, see build flags above
94+
# Cassandra, Mroonga etc never built on Travis CI anyway, see build flags above
10495
if [[ $TRAVIS ]]
10596
then
106-
sed -i -e "/Package: mariadb-plugin-tokudb/,/^$/d" debian/control
10797
sed -i -e "/Package: mariadb-plugin-mroonga/,/^$/d" debian/control
10898
sed -i -e "/Package: mariadb-plugin-spider/,/^$/d" debian/control
10999
sed -i -e "/Package: mariadb-plugin-oqgraph/,/^$/d" debian/control

debian/rules

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,6 @@ endif
125125
# If mariadb-test package is removed, also remove most of it's files
126126
grep --quiet "Package: mariadb-test" debian/control || rm -rf $(TMP)/usr/share/mysql/mysql-test
127127

128-
# Delete runnable files we don't want to have in the test data package.
129-
# This avoids triggering multiple Lintian errors.
130-
rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/*.py
131-
rm -rf $(TMP)/usr/share/mysql/mysql-test/plugin/tokudb/tokudb/t/*.py
132-
133128
# nm numeric soft is not enough, therefore extra sort in command
134129
# to satisfy Debian reproducible build requirements
135130
nm --defined-only $(BUILDDIR)/sql/mysqld | LC_ALL=C sort | gzip -n -9 > $(TMP)/usr/share/doc/mariadb-server-10.5/mysqld.sym.gz

0 commit comments

Comments
 (0)