Merge ~paride/ubuntu/+source/autopkgtest:lp1988527-ppc64-kvm into ubuntu/+source/autopkgtest:ubuntu/devel

[Paride Legovini]

fb293a4... by Paride Legovini on 2022-09-07

Update changelog for 5.25ubuntu1 release

[Brian Murray (brian-murray)]

review: Approve

63e7faf... by Paride Legovini on 2022-09-07

update-maintainer

diff --git a/debian/changelog b/debian/changelog
index e5eed2f..8cc862c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+autopkgtest (5.25ubuntu1) kinetic; urgency=medium
+
+  * qemu: fix the ppc64le arch name in kvm_compatible().
+    Upstream cherry-pick (93fd5ea9). (LP: #1988527)
+
+ -- Paride Legovini <[e-mail]>  Wed, 07 Sep 2022 17:28:05 +0200
+
 autopkgtest (5.25) unstable; urgency=medium
 
   [ Antonio Terceiro ]
diff --git a/debian/control b/debian/control
index d8e4a55..bb8cbd1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: autopkgtest
-Maintainer: Debian CI team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian CI team <[e-mail]>
 Uploaders: Ian Jackson <[e-mail]>,
            Martin Pitt <[e-mail]>,
            Antonio Terceiro <[e-mail]>,
diff --git a/lib/autopkgtest_qemu.py b/lib/autopkgtest_qemu.py
index 6733ede..13fae41 100644
--- a/lib/autopkgtest_qemu.py
+++ b/lib/autopkgtest_qemu.py
@@ -631,8 +631,7 @@ class Qemu:
             'aarch64': ['aarch64'],
             # According to https://wiki.alpinelinux.org/wiki/S390x/Installation
             's390x': ['s390x'],
-            # According to https://wiki.debian.org/ppc64el/Installation
-            'ppc64el': ['ppc64el'],
+            'ppc64le': ['ppc64le'],
         }.get(uname_m, [])
 
     def get_socket_path(self, name: str) -> str: