Skip to content

Commit

Permalink
Deb: sync architecture restrictions from packaging in Debian official
Browse files Browse the repository at this point in the history
  • Loading branch information
ottok authored and cvicentiu committed Jan 16, 2018
1 parent e260c6a commit 0949382
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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}
Expand Down
7 changes: 1 addition & 6 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 0949382

Please sign in to comment.