This is an automated email from the git hooks/post-receive script.
guillem pushed a commit to branch master
in repository dpkg.
commit ee0855cc66076691de4796be48f8a0d889fde001
Author: Manuel A. Fernandez Montecelo <m...@debian.org>
Date: Tue Jan 16 00:43:51 2018 +0100
arch: Add support for riscv64 CPU
[guil...@debian.org:
- Update unit-tests. ]
Closes: #822914
Stable-Candidate: 1.18.x
Signed-off-by: Guillem Jover <guil...@debian.org>
---
data/cputable | 1 +
debian/changelog | 3 +++
scripts/t/Dpkg_Arch.t | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/data/cputable b/data/cputable
index a2bd7d6..9f2a8e0 100644
--- a/data/cputable
+++ b/data/cputable
@@ -41,6 +41,7 @@ powerpc powerpc (powerpc|ppc)
32 big
powerpcel powerpcle powerpcle 32 little
ppc64 powerpc64 (powerpc|ppc)64 64 big
ppc64el powerpc64le powerpc64le 64 little
+riscv64 riscv64 riscv64 64 little
s390 s390 s390 32 big
s390x s390x s390x 64 big
sh3 sh3 sh3 32 little
diff --git a/debian/changelog b/debian/changelog
index 2d4f616..74bab5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
variables to buildtools.mk. Prompted by Helmut Grohne <hel...@subdivi.de>.
* Restore rejecting negated architectures in Architecture field in
dpkg-gencontrol and dpkg-genchanges. Regression introduced in dpkg 1.18.5.
+ * Architecture support:
+ - Add support for riscv64 CPU. Closes: #822914
+ Thanks to Manuel A. Fernandez Montecelo <m...@debian.org>
* Perl modules:
- Check that $tarname is defined before use in Dpkg::Source::Package::V1.
Thanks to Christoph Biedl <debian.a...@manchmal.in-ulm.de>.
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 0ef9d18..9d2aaf3 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -16,7 +16,7 @@
use strict;
use warnings;
-use Test::More tests => 16369;
+use Test::More tests => 16832;
use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
debarch_eq debarch_is debarch_is_wildcard
@@ -169,7 +169,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet');
is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown
gnutriplet');
is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet');
-is(scalar get_valid_arches(), 524, 'expected amount of known architectures');
+is(scalar get_valid_arches(), 539, 'expected amount of known architectures');
{
local $ENV{CC} = 'false';
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/dpkg/dpkg.git
