From 094938255d1926f16b0f74bcbd7c3e967eaef2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Otto=20Kek=C3=A4l=C3=A4inen?= Date: Fri, 12 Jan 2018 12:05:30 +0000 Subject: [PATCH] Deb: sync architecture restrictions from packaging in Debian official --- debian/control | 4 ++-- debian/rules | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/debian/control b/debian/control index fe9a10a2cb8..bbea53788ca 100644 --- a/debian/control +++ b/debian/control @@ -500,7 +500,7 @@ Description: OQGraph storage engine for MariaDB This package contains the OQGraph plugin for MariaDB. Package: mariadb-plugin-tokudb -Architecture: any +Architecture: amd64 Depends: mariadb-server-10.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} @@ -519,7 +519,7 @@ Description: TokuDB storage engine for MariaDB This package contains the TokuDB plugin for MariaDB. Package: mariadb-plugin-mroonga -Architecture: any +Architecture: any-alpha any-amd64 any-arm any-arm64 any-i386 any-ia64 any-mips64el any-mips64r6el any-mipsel any-mipsr6el any-nios2 any-powerpcel any-ppc64el any-sh3 any-sh4 any-tilegx Depends: mariadb-server-10.3 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} diff --git a/debian/rules b/debian/rules index 76433d47576..456af8b0664 100755 --- a/debian/rules +++ b/debian/rules @@ -39,7 +39,7 @@ else endif # Ignore test suite exit code on unstable platforms -ifneq (,$(filter $(ARCH), mips mipsel)) +ifneq (,$(filter $(ARCH),mips mipsel mips64el alpha powerpc sh4 hurd-i386 sparc64 kfreebsd-i386 kfreebsd-amd64)) TESTSUITE_FAIL_CMD:=true else TESTSUITE_FAIL_CMD:=exit 1 @@ -114,11 +114,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/,+18d" debian/control -endif - # If libthrift-dev was available (manually installed, as it is # not in Debian) and ha_cassandra.so was thus built, create package, # otherwise skip it.