Removed all patches. Upstream fixed source code.
Joao Eriberto Mota Filho
5 years ago
6 | 6 |
- Added packaging rights for Guido Günther.
|
7 | 7 |
- Updated upstream and packaging copyright years.
|
8 | 8 |
- Using https in Source field.
|
|
9 |
* debian/patches/: removed patches Determine-architecture-via-uname-m.patch
|
|
10 |
and Remove-bashisms.patch. The upstream fixed the source code. Thanks!
|
9 | 11 |
|
10 | 12 |
-- Joao Eriberto Mota Filho <eriberto@debian.org> Sat, 08 Dec 2018 11:55:55 -0200
|
11 | 13 |
|
debian/patches/Determine-architecture-via-uname-m.patch
less
more
0 | |
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
1 | |
Date: Sat, 27 Jan 2018 13:11:36 +0100
|
2 | |
Subject: Determine architecture via 'uname -m'
|
3 | |
|
4 | |
'uname -p' only gives unknown on x86_64, i386, arm6l (rpi) and aarch64
|
5 | |
(scaleways).
|
6 | |
|
7 | |
Closes: #888690
|
8 | |
---
|
9 | |
virt-what.in | 4 ++--
|
10 | |
1 file changed, 2 insertions(+), 2 deletions(-)
|
11 | |
|
12 | |
diff --git a/virt-what.in b/virt-what.in
|
13 | |
index 56af1ad..97ebd79 100644
|
14 | |
--- a/virt-what.in
|
15 | |
+++ b/virt-what.in
|
16 | |
@@ -102,9 +102,9 @@ cpuid=$(virt-what-cpuid-helper)
|
17 | |
dmi=$(LANG=C dmidecode 2>&1)
|
18 | |
|
19 | |
# Architecture.
|
20 | |
-# Note for the purpose of testing, we only call uname with -p option.
|
21 | |
+# Note for the purpose of testing, we only call uname with -m option.
|
22 | |
|
23 | |
-arch=$(uname -p | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
|
24 | |
+arch=$(uname -m | sed -e 's/i.86/i386/' | sed -e 's/arm.*/arm/')
|
25 | |
|
26 | |
# Check for VMware.
|
27 | |
# cpuid check added by Chetan Loke.
|
debian/patches/Remove-bashisms.patch
less
more
0 | |
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
1 | |
Date: Wed, 2 Aug 2017 14:16:07 -0300
|
2 | |
Subject: Remove bashisms
|
3 | |
|
4 | |
Use [ instead of [[ and -a instead of && so we fall back to test if
|
5 | |
necessary:
|
6 | |
|
7 | |
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
|
8 | |
---
|
9 | |
virt-what.in | 12 ++++++------
|
10 | |
1 file changed, 6 insertions(+), 6 deletions(-)
|
11 | |
|
12 | |
diff --git a/virt-what.in b/virt-what.in
|
13 | |
index 8c27b11..56af1ad 100644
|
14 | |
--- a/virt-what.in
|
15 | |
+++ b/virt-what.in
|
16 | |
@@ -360,20 +360,20 @@ if [ "$cpuid" = "OpenBSDVMM58" ]; then
|
17 | |
fi
|
18 | |
|
19 | |
# Check for LDoms
|
20 | |
-if [[ "$arch" == sparc* && -e ${root}/dev/mdesc ]]; then
|
21 | |
+if [ ${arch#sparc} != "$arch" -a -e ${root}/dev/mdesc ]; then
|
22 | |
echo ldoms
|
23 | |
- if [[ -d ${root}/sys/class/vlds/ctrl && \
|
24 | |
- -d ${root}/sys/class/vlds/sp ]]; then
|
25 | |
+ if [ -d ${root}/sys/class/vlds/ctrl -a \
|
26 | |
+ -d ${root}/sys/class/vlds/sp ]; then
|
27 | |
echo ldoms-control
|
28 | |
else
|
29 | |
echo ldoms-guest
|
30 | |
fi
|
31 | |
MDPROP="${root}/usr/lib/ldoms/mdprop.py"
|
32 | |
- if [[ -x ${MDPROP} ]]; then
|
33 | |
- if [[ -n $($MDPROP -v iodevice device-type=pciex) ]]; then
|
34 | |
+ if [ -x ${MDPROP} ]; then
|
35 | |
+ if [ -n $($MDPROP -v iodevice device-type=pciex) ]; then
|
36 | |
echo ldoms-root
|
37 | |
echo ldoms-io
|
38 | |
- elif [[ -n $($MDPROP -v iov-device vf-id=0) ]]; then
|
39 | |
+ elif [ -n $($MDPROP -v iov-device vf-id=0) ]; then
|
40 | |
echo ldoms-io
|
41 | |
fi
|
42 | |
fi
|
0 | |
Remove-bashisms.patch
|
1 | |
Determine-architecture-via-uname-m.patch
|