Bug#888731: stretch-pu: package virt-what/1.15-1+deb9u1
Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu
The update fixes problems with virt detection arch/aarch64 since these
fall back to uname -m. x86 uses cpuid mostly so it went there
undetected.
Cheers,
-- Guido
-- System Information:
Debian Release: buster/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'stable-updates'), (500, 'oldoldstable'), (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.14.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog
index beabec6..a9fcd09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virt-what (1.15-1+deb9u1) stable-proposed-updates; urgency=medium
+
+ * Unbreak virt detection on arm/aarch64 (Closes: #888690)
+
+ -- Guido Günther <agx@sigxcpu.org> Sun, 28 Jan 2018 19:41:53 +0100
+
virt-what (1.15-1) unstable; urgency=medium
[ Guido Günther ]
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 760033d..a57e359 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
[DEFAULT]
upstream-branch=upstream/latest
-debian-branch=debian/sid
+debian-branch=debian/stretch
[pq]
patch-numbers = False
diff --git a/debian/patches/Determine-architecture-via-uname-m.patch b/debian/patches/Determine-architecture-via-uname-m.patch
new file mode 100644
index 0000000..3352f96
--- /dev/null
+++ b/debian/patches/Determine-architecture-via-uname-m.patch
@@ -0,0 +1,28 @@
+From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Sat, 27 Jan 2018 13:11:36 +0100
+Subject: Determine architecture via 'uname -m'
+
+'uname -p' only gives unknown on x86_64, i386, arm6l (rpi) and aarch64
+(scaleways).
+
+Closes: #888690
+---
+ virt-what.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/virt-what.in b/virt-what.in
+index a5ed33e..ddfb53a 100644
+--- a/virt-what.in
++++ b/virt-what.in
+@@ -101,9 +101,9 @@ cpuid=$(virt-what-cpuid-helper)
+ dmi=$(LANG=C dmidecode 2>&1)
+
+ # Architecture.
+-# Note for the purpose of testing, we only call uname with -p option.
++# Note for the purpose of testing, we only call uname with -m option.
+
+-arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
++arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
+
+ # Check for VMware.
+ # cpuid check added by Chetan Loke.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4879f6d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Determine-architecture-via-uname-m.patch
Reply to: