Rebase to 5.0
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
This commit is contained in:
Vitaly Kuznetsov
parent
0f15a4a22f
commit
a941e774c9
@ -1,48 +0,0 @@
|
||||
From 1e2d32c6ee12b45823ba3cda0054a4bd843896fc Mon Sep 17 00:00:00 2001
|
||||
From: Olaf Hering <olaf@aepfle.de>
|
||||
Date: Tue, 5 Jun 2018 13:37:55 -0700
|
||||
Subject: [PATCH] tools: hv: update lsvmbus to be compatible with python3
|
||||
|
||||
Python3 changed the way how 'print' works.
|
||||
Adjust the code to a syntax that is understood by python2 and python3.
|
||||
|
||||
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||||
Acked-by: Dexuan Cui <decui@microsoft.com>
|
||||
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
||||
---
|
||||
tools/hv/lsvmbus | 12 ++++++------
|
||||
1 file changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/tools/hv/lsvmbus b/tools/hv/lsvmbus
|
||||
index 353e56768df8..55e7374bade0 100644
|
||||
--- a/tools/hv/lsvmbus
|
||||
+++ b/tools/hv/lsvmbus
|
||||
@@ -17,7 +17,7 @@ if options.verbose is not None:
|
||||
|
||||
vmbus_sys_path = '/sys/bus/vmbus/devices'
|
||||
if not os.path.isdir(vmbus_sys_path):
|
||||
- print "%s doesn't exist: exiting..." % vmbus_sys_path
|
||||
+ print("%s doesn't exist: exiting..." % vmbus_sys_path)
|
||||
exit(-1)
|
||||
|
||||
vmbus_dev_dict = {
|
||||
@@ -93,11 +93,11 @@ format2 = '%2s: Class_ID = %s - %s\n\tDevice_ID = %s\n\tSysfs path: %s\n%s'
|
||||
|
||||
for d in vmbus_dev_list:
|
||||
if verbose == 0:
|
||||
- print ('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc)
|
||||
+ print(('VMBUS ID ' + format0) % (d.vmbus_id, d.dev_desc))
|
||||
elif verbose == 1:
|
||||
- print ('VMBUS ID ' + format1) % \
|
||||
- (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping)
|
||||
+ print (('VMBUS ID ' + format1) % \
|
||||
+ (d.vmbus_id, d.class_id, d.dev_desc, d.chn_vp_mapping))
|
||||
else:
|
||||
- print ('VMBUS ID ' + format2) % \
|
||||
+ print (('VMBUS ID ' + format2) % \
|
||||
(d.vmbus_id, d.class_id, d.dev_desc, \
|
||||
- d.device_id, d.sysfs_path, d.chn_vp_mapping)
|
||||
+ d.device_id, d.sysfs_path, d.chn_vp_mapping))
|
||||
--
|
||||
2.14.4
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Hyper-V FCOPY daemon binary name
|
||||
%global hv_fcopy_daemon hypervfcopyd
|
||||
# snapshot version
|
||||
%global snapver .20180415git
|
||||
%global snapver .20190303git
|
||||
# use hardened build
|
||||
%global _hardened_build 1
|
||||
# udev rules prefix
|
||||
@ -13,7 +13,7 @@
|
||||
|
||||
Name: hyperv-daemons
|
||||
Version: 0
|
||||
Release: 0.27%{?snapver}%{?dist}
|
||||
Release: 0.28%{?snapver}%{?dist}
|
||||
Summary: Hyper-V daemons suite
|
||||
|
||||
License: GPLv2
|
||||
@ -44,9 +44,6 @@ Source202: hypervfcopy.rules
|
||||
# HYPERV TOOLS
|
||||
Source301: lsvmbus
|
||||
|
||||
# Make lsvmbus Python3 compatible
|
||||
Patch0: 0001-tools-hv-update-lsvmbus-to-be-compatible-with-python.patch
|
||||
|
||||
# Hyper-V is available only on x86 architectures
|
||||
# The base empty (a.k.a. virtual) package can not be noarch
|
||||
# due to http://www.rpm.org/ticket/78
|
||||
@ -134,7 +131,6 @@ cp -pvL %{SOURCE100} hv_vss_daemon.c
|
||||
cp -pvL %{SOURCE200} hv_fcopy_daemon.c
|
||||
|
||||
cp -pvL %{SOURCE301} lsvmbus
|
||||
%patch0 -p3 -b .lsvmbus_python3
|
||||
|
||||
%build
|
||||
# HYPERV KVP DAEMON
|
||||
@ -250,6 +246,9 @@ fi
|
||||
%{_sbindir}/lsvmbus
|
||||
|
||||
%changelog
|
||||
* Fri Mar 15 2019 Vitaly Kuznetsov <vkuznets@redhat.com> - 0-0.28.20190303git
|
||||
- Rebase to 5.0
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0-0.27.20180415git
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
|
||||
8
sources
8
sources
@ -1,8 +1,8 @@
|
||||
SHA512 (hv_get_dhcp_info.sh) = 4a9503f2a368cc078e00cdc7d3313d3e6f9c8e18c68e6b9ba0a1b6e4c8c0dbf8183d33158588097b275b7afba08d548187e27cdde05e3321065251389b1bdc63
|
||||
SHA512 (hv_get_dns_info.sh) = 876effabea3ffe1daaa9c68dfa9b254d740003716f081aa524a1bdbd81724f744bd9dd900f2fdd94764d67584d3e853b26576aa8b53d6f6df94b12702a167428
|
||||
SHA512 (hv_kvp_daemon.c) = 32297a5fe4ad4b36e17c141595a231dae35282f1af90d607d6039106f4b1c8209a568002dc0139f29d793e10eec129b2fcddd01caeb825ebb353df044ea41c35
|
||||
SHA512 (hv_kvp_daemon.c) = c75c0bb439e49173c0f20712b654e4d566c0e98ea8aae85d039ba47692d8223103eaa34893b170b0be86188d19f5702024db4e5e1b6682baffaf2538d0e64dd1
|
||||
SHA512 (hv_set_ifconfig.sh) = da6bbd90a265ebab7f63985c57ba8a19c1a9e3ca1e15f361663ec166c85647ecfb89e805a9b51134ebcd896b98a9dc4e2104665d3a0d2f3b5494e61cffbd8d86
|
||||
SHA512 (hv_vss_daemon.c) = efe39fe24633e83de87ca8b4eb87e50678cb6bd03b8f7e6cb32779decdb5a12ce6c4b6c02dcb8ef4b94565fe5692ba9f39c4e5f4f5294d0a75e35cd89ecfec83
|
||||
SHA512 (hv_fcopy_daemon.c) = 4f6cbe75f015d16761fd0c371e4cd93f455d9ce2ae4380d30274d5d4a23c67a9e47f7a4f680ac1f4b941302418a32d0885103c5d2ee22bcab5cd2dd031c24588
|
||||
SHA512 (hv_vss_daemon.c) = 02d537fc19cbfa6758b7249ea14bff60de743c107546dacba81a7f8808e905165cf30be43d2961ef01c289406dd96d3c8912d613258b70a617aba97d9b674e0b
|
||||
SHA512 (hv_fcopy_daemon.c) = ba1ced555e9ad2b119f64b3944c1b97adf9ec2cec4d677815520a4f2236b6fcc7cb3545ef6c128d260674a11659b87fc5f2c984431d68deb324a3ed21fb94c4f
|
||||
SHA512 (COPYING) = fbb1e0f29741e900a81ccbe76102103365423d310e9987dfc5858174999911037a9ad48270a3d0b86f245e91868ed73813ca273584be43816f53517858f3aabd
|
||||
SHA512 (lsvmbus) = baeb2061b25075c6aea323005692672df4e8769ee77ee5984dafb1ea46e77e504dc194c9eaf2587b348f4abf52a74bc95c6298f79b2e880714434c8db81f55fd
|
||||
SHA512 (lsvmbus) = c7bb7ff942ea6108399200a53d527f97feedb44a176d624c4008cea4ff5afc791464b8ded267ce4f430d324f26e4eb751dfd7401504cf9242480e52962052ffc
|
||||
|
||||
Loading…
Reference in New Issue
Block a user