diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-01-28 23:29:43 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2021-01-29 21:06:08 +0200 |
| commit | 4a4171286654cfc43d958ef1a26ceb37333c5623 (patch) | |
| tree | 209c22a1a216f8b55534d694d591b3b80989e881 | |
| parent | 9c84852809214e97cf91327a798204c1b745881e (diff) | |
| download | mariadb-git-4a4171286654cfc43d958ef1a26ceb37333c5623.tar.gz | |
Skip TokuDB within autobake-deb.sh
Skipping the package within debian/rules won't work because starting
with Debian 10, the helper scripts read the control file before the
recipe.
| -rwxr-xr-x | debian/autobake-deb.sh | 6 | ||||
| -rwxr-xr-x | debian/rules | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh index ddef69bb350..5cf2398575a 100755 --- a/debian/autobake-deb.sh +++ b/debian/autobake-deb.sh @@ -91,6 +91,12 @@ then sed '/Package: mariadb-plugin-rocksdb/,/^$/d' -i debian/control fi +## Skip TokuDB if arch is not amd64 +if [[ ! $(dpkg-architecture -q DEB_BUILD_ARCH) =~ amd64 ]] +then + sed '/Package: mariadb-plugin-tokudb/,/^$/d' -i debian/control +fi + # Always remove aws plugin, see -DNOT_FOR_DISTRIBUTION in CMakeLists.txt sed '/Package: mariadb-plugin-aws-key-management-10.2/,/^$/d' -i debian/control diff --git a/debian/rules b/debian/rules index 809911d4179..35d5adf3f8a 100755 --- a/debian/rules +++ b/debian/rules @@ -112,11 +112,6 @@ override_dh_auto_install: dh_testdir dh_testroot -# Skip TokuDB if arch is not amd64 -ifneq ($(ARCH), amd64) - sed -i -e "/Package: mariadb-plugin-tokudb/,+16d" debian/control -endif - # Copy systemd files to a location available for dh_installinit cp $(BUILDDIR)/support-files/mariadb.service debian/mariadb-server-10.2.mariadb.service cp $(BUILDDIR)/support-files/mariadb@.service debian/mariadb-server-10.2.mariadb@.service |