Skip to content

Commit 0949382

Browse files
ottokcvicentiu
authored andcommitted
Deb: sync architecture restrictions from packaging in Debian official
1 parent e260c6a commit 0949382

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ Description: OQGraph storage engine for MariaDB
500500
This package contains the OQGraph plugin for MariaDB.
501501

502502
Package: mariadb-plugin-tokudb
503-
Architecture: any
503+
Architecture: amd64
504504
Depends: mariadb-server-10.3 (= ${binary:Version}),
505505
${misc:Depends},
506506
${shlibs:Depends}
@@ -519,7 +519,7 @@ Description: TokuDB storage engine for MariaDB
519519
This package contains the TokuDB plugin for MariaDB.
520520

521521
Package: mariadb-plugin-mroonga
522-
Architecture: any
522+
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
523523
Depends: mariadb-server-10.3 (= ${binary:Version}),
524524
${misc:Depends},
525525
${shlibs:Depends}

debian/rules

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ else
3939
endif
4040

4141
# Ignore test suite exit code on unstable platforms
42-
ifneq (,$(filter $(ARCH), mips mipsel))
42+
ifneq (,$(filter $(ARCH),mips mipsel mips64el alpha powerpc sh4 hurd-i386 sparc64 kfreebsd-i386 kfreebsd-amd64))
4343
TESTSUITE_FAIL_CMD:=true
4444
else
4545
TESTSUITE_FAIL_CMD:=exit 1
@@ -114,11 +114,6 @@ override_dh_auto_install:
114114
dh_testdir
115115
dh_testroot
116116

117-
# Skip TokuDB if arch is not amd64
118-
ifneq ($(ARCH), amd64)
119-
sed -i -e "/Package: mariadb-plugin-tokudb/,+18d" debian/control
120-
endif
121-
122117
# If libthrift-dev was available (manually installed, as it is
123118
# not in Debian) and ha_cassandra.so was thus built, create package,
124119
# otherwise skip it.

0 commit comments

Comments
 (0)