Import Debian changes 1:2.2.1-ok1
This commit is contained in:
Cong Liu
parent
9c146ac581
commit
e0a29c7438
|
|
@ -0,0 +1,2 @@
|
|||
[org.virt-manager.virt-manager.console]
|
||||
auto-redirect=false
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Access Control
|
||||
==============
|
||||
Access to the libvirt socket is controlled by membership in the "libvirt"
|
||||
group. If you want to manage virtual machines as non root you need to add your
|
||||
user to that group or you have to use the session uris like qemu:///session.
|
||||
|
||||
See also /usr/share/doc/libvirt-bin/README.Debian.
|
||||
|
||||
-- Guido Guenther <agx@sigxcpu.org> Thu, 04 Jun 2010 11:46:03 +0100
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Access Control
|
||||
==============
|
||||
Access to the libvirt socket is controlled by membership in the "libvirt"
|
||||
group. If you want to manage virtual machines as non root you need to add your
|
||||
user to that group or you have to use the session uris like qemu:///session.
|
||||
|
||||
See also /usr/share/doc/libvirt-daemon-system/README.Debian.gz.
|
||||
|
||||
-- Guido Guenther <agx@sigxcpu.org> Thu, 04 Jun 2010 11:46:03 +0100
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
This package is maintained with git-buildpackage(1). It follows DEP-14
|
||||
for branch naming (e.g. using debian/sid for the current version
|
||||
in Debian unstable).
|
||||
|
||||
It uses pristine-tar(1) to store enough information in git to generate
|
||||
bit identical tarballs when building the package without having
|
||||
downloaded an upstream tarball first.
|
||||
|
||||
When working with patches it is recommended to use "gbp pq import" to
|
||||
import the patches, modify the source and then use "gbp pq export
|
||||
--commit" to commit the modifications.
|
||||
|
||||
The changelog is generated using "gbp dch" so if you submit any
|
||||
changes don't bother to add changelog entries but rather provide
|
||||
a nice git commit message that can then end up in the changelog.
|
||||
|
||||
It is recommended to build the package with pbuilder using:
|
||||
|
||||
gbp builpackage --git-pbuilder
|
||||
|
||||
For information on how to set up a pbuilder environment see the
|
||||
git-pbuilder(1) manpage. In short:
|
||||
|
||||
DIST=sid git-pbuilder create
|
||||
gbp clone <project-url>
|
||||
cd <project>
|
||||
gbp buildpackage --git-pbuilder
|
||||
|
||||
-- Guido Günther <agx@igxcpu.org>, Wed, 2 Dec 2015 18:51:15 +0100
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
When reporting issues regarding virt-manager please run the program using the
|
||||
--debug --no-fork command line options and provide the output.
|
||||
|
||||
Often the problem isn't related to virt-manager at all. Please also check the
|
||||
libvirt and VM logfiles and try to reproduce with virsh or virt-install.
|
||||
|
||||
http://wiki.debian.org/libvirt/Debugging has more information on howto provide
|
||||
debugging information for the virt-* tools.
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
virt-manager (1:2.2.1-ok1) yangtze; urgency=medium
|
||||
|
||||
* rebuild source for openKylin
|
||||
|
||||
-- Cong Liu <liucong2@kylinos.cn> Fri, 11 Nov 2022 16:29:42 +0800
|
||||
|
|
@ -0,0 +1 @@
|
|||
12
|
||||
|
|
@ -0,0 +1,90 @@
|
|||
Source: virt-manager
|
||||
Section: admin
|
||||
Priority: optional
|
||||
Maintainer: OpenKylin Virtualization SIG <virtualization@lists.openkylin.top>
|
||||
Uploaders: Cong Liu <liucong2@kylinos.cn>
|
||||
Standards-Version: 4.4.0
|
||||
Vcs-Git: https://gitee.com/openkylin/virt-manager.git
|
||||
Vcs-Browser: https://gitee.com/openkylin/virt-manager
|
||||
Homepage: http://virt-manager.org/
|
||||
Build-Depends:
|
||||
debhelper (>= 12~),
|
||||
dh-python,
|
||||
intltool,
|
||||
libglib2.0-bin,
|
||||
python3-all,
|
||||
# for the tests
|
||||
cpio,
|
||||
gir1.2-libosinfo-1.0,
|
||||
gir1.2-libvirt-glib-1.0,
|
||||
libvirt-daemon,
|
||||
python3-gi,
|
||||
python3-libvirt,
|
||||
python3-libxml2,
|
||||
python3-requests,
|
||||
unzip,
|
||||
|
||||
Package: virt-manager
|
||||
Architecture: all
|
||||
Depends:
|
||||
gir1.2-appindicator3-0.1,
|
||||
gir1.2-gtk-3.0 (>= 3.10),
|
||||
gir1.2-gtk-vnc-2.0,
|
||||
gir1.2-gtksource-4,
|
||||
gir1.2-libosinfo-1.0,
|
||||
gir1.2-libvirt-glib-1.0,
|
||||
gir1.2-vte-2.91,
|
||||
librsvg2-common,
|
||||
python3-dbus,
|
||||
python3-gi,
|
||||
python3-gi-cairo,
|
||||
python3-libvirt (>= 0.7.1),
|
||||
virtinst (>= ${binary:Version}),
|
||||
${misc:Depends},
|
||||
${python3:Depends},
|
||||
Recommends:
|
||||
gir1.2-spiceclientglib-2.0,
|
||||
gir1.2-spiceclientgtk-3.0,
|
||||
libvirt-daemon-system (>= 1.2.7),
|
||||
Suggests:
|
||||
gir1.2-secret-1,
|
||||
gnome-keyring,
|
||||
python3-guestfs,
|
||||
ssh-askpass,
|
||||
virt-viewer,
|
||||
Description: desktop application for managing virtual machines
|
||||
It presents a summary view of running domains and their live performance &
|
||||
resource utilization statistics. A detailed view presents graphs showing
|
||||
performance & utilization over time. Ultimately it will allow creation of new
|
||||
domains, and configuration & adjustment of a domain's resource allocation &
|
||||
virtual hardware. Finally an embedded VNC client viewer presents a full
|
||||
graphical console to the guest domain.
|
||||
.
|
||||
NOTE: the GUI is still considered experimental.
|
||||
|
||||
Package: virtinst
|
||||
Architecture: all
|
||||
Depends:
|
||||
e2fsprogs,
|
||||
genisoimage,
|
||||
gir1.2-libosinfo-1.0,
|
||||
python3,
|
||||
python3-distutils,
|
||||
python3-gi,
|
||||
python3-libvirt (>= 0.4.6),
|
||||
python3-libxml2,
|
||||
python3-requests,
|
||||
${misc:Depends},
|
||||
${python3:Depends},
|
||||
${shlibs:Depends},
|
||||
Recommends:
|
||||
qemu-utils,
|
||||
virt-viewer,
|
||||
Description: Programs to create and clone virtual machines
|
||||
Virtinst is a set of commandline tools to create virtual machines using
|
||||
libvirt:
|
||||
.
|
||||
virt-install: provision new virtual machines
|
||||
virt-clone: clone existing virtual machines
|
||||
virt-xml: edit libvirt XML using command line options.
|
||||
virt-convert: convert virtual machines between formats
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
This is the Ubuntu / Debian GNU/Linux prepackaged version of the
|
||||
Virtual Machine Manger.
|
||||
|
||||
Packaged by Marcelo Boveto Shima <marceloshima@gmail.com>
|
||||
and Guido Guenther <agx@sigxcpu.org>
|
||||
|
||||
Downloaded from http://virt-manager.et.redhat.com/download.html
|
||||
|
||||
Upstream Author:
|
||||
|
||||
Daniel Berrange <berrange-at-redhat-dot-com>
|
||||
Hugh O. Brock <hbrock-at-redhat-dot-com>
|
||||
Jeremy Katz <katzj-at-redhat-dot-com>
|
||||
|
||||
Copyright:
|
||||
|
||||
Daniel Berrange <berrange-at-redhat-dot-com>
|
||||
Red Hat, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; version 2 dated June, 1991.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
|
||||
St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU
|
||||
General Public License can be found in `/usr/share/common-licenses/GPL'.
|
||||
|
||||
src/graphWidgets:
|
||||
|
||||
Copyright (C) 2005-2006 Red Hat, Inc., David Malcolm <dmalcolm@redhat.com>
|
||||
Copyright (C) 2006 Daniel P. Berrange <berrange@redhat.com>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
You should have received a copy of the GNU Library General Public License with
|
||||
this program; if not, write to the Free Software Foundation, Inc., 51 Franklin
|
||||
St, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
|
||||
On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU
|
||||
General Library Public License can be found in
|
||||
`/usr/share/common-licenses/LGPL-2'.
|
||||
|
||||
help/:
|
||||
|
||||
Copyright 2007 Red Hat Inc., and Hugh Brock
|
||||
|
||||
Permission is granted to copy, distribute and/or modify this
|
||||
document under the terms of the GNU Free Documentation
|
||||
License (GFDL), Version 1.1 or any later version published
|
||||
by the Free Software Foundation with no Invariant Sections,
|
||||
no Front-Cover Texts, and no Back-Cover Texts.
|
||||
|
||||
On Ubuntu / Debian GNU/Linux systems, the complete text of the GNU Free
|
||||
Documentation License can be found in `/usr/share/common-licenses/GFDL'.
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
[DEFAULT]
|
||||
upstream-branch=upstream/latest
|
||||
debian-branch=debian/sid
|
||||
|
||||
[pq]
|
||||
patch-numbers = False
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
From: =?utf-8?q?Guido_G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Sat, 24 Dec 2016 01:18:30 +0100
|
||||
Subject: Use /usr/bin/python3
|
||||
|
||||
so we don't have to worry about picking up the wrong version
|
||||
---
|
||||
setup.py | 3 +--
|
||||
virt-clone | 2 +-
|
||||
virt-convert | 2 +-
|
||||
virt-install | 2 +-
|
||||
virt-manager | 2 +-
|
||||
virt-xml | 2 +-
|
||||
6 files changed, 6 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/setup.py b/setup.py
|
||||
index 275087b..1f7aa98 100755
|
||||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -1,9 +1,8 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# This work is licensed under the GNU GPLv2 or later.
|
||||
# See the COPYING file in the top-level directory.
|
||||
|
||||
-
|
||||
import sys
|
||||
if sys.version_info.major < 3:
|
||||
print("virt-manager is python3 only. Run this as ./setup.py")
|
||||
diff --git a/virt-clone b/virt-clone
|
||||
index 472bd3e..79355da 100755
|
||||
--- a/virt-clone
|
||||
+++ b/virt-clone
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# Copyright(c) FUJITSU Limited 2007.
|
||||
#
|
||||
diff --git a/virt-convert b/virt-convert
|
||||
index df7fa84..ca4f212 100755
|
||||
--- a/virt-convert
|
||||
+++ b/virt-convert
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# Copyright 2008, 2013, 2014 Red Hat, Inc.
|
||||
#
|
||||
diff --git a/virt-install b/virt-install
|
||||
index af6c75b..0cd5da7 100755
|
||||
--- a/virt-install
|
||||
+++ b/virt-install
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# Copyright 2005-2014 Red Hat, Inc.
|
||||
#
|
||||
diff --git a/virt-manager b/virt-manager
|
||||
index ca6a593..b4b7eb2 100755
|
||||
--- a/virt-manager
|
||||
+++ b/virt-manager
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# Copyright (C) 2006, 2014 Red Hat, Inc.
|
||||
# Copyright (C) 2006 Daniel P. Berrange <berrange@redhat.com>
|
||||
diff --git a/virt-xml b/virt-xml
|
||||
index 71445c9..de5cd2d 100755
|
||||
--- a/virt-xml
|
||||
+++ b/virt-xml
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python3
|
||||
+#!/usr/bin/python3
|
||||
#
|
||||
# Copyright 2013-2014 Red Hat, Inc.
|
||||
#
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
Description: Fix legacy-images path for focal.
|
||||
Author: Dimitri John Ledkov <xnox@ubuntu.com>
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/1872941
|
||||
|
||||
|
||||
Index: virt-manager-2.2.1/virtinst/install/urldetect.py
|
||||
===================================================================
|
||||
--- virt-manager-2.2.1.orig/virtinst/install/urldetect.py
|
||||
+++ virt-manager-2.2.1/virtinst/install/urldetect.py
|
||||
@@ -640,6 +640,8 @@ class _DebianDistro(_DistroTree):
|
||||
media_type = None
|
||||
if check_manifest("current/images/MANIFEST"):
|
||||
media_type = "url"
|
||||
+ elif check_manifest("current/legacy-images/MANIFEST"):
|
||||
+ media_type = "url"
|
||||
elif check_manifest("daily/MANIFEST"):
|
||||
media_type = "daily"
|
||||
elif cache.content_regex(".disk/info",
|
||||
@@ -693,6 +695,9 @@ class _DebianDistro(_DistroTree):
|
||||
|
||||
def _set_url_paths(self):
|
||||
url_prefix = "current/images"
|
||||
+ if self._debname == "ubuntu" and self._os_variant >= 'ubuntu20.04':
|
||||
+ url_prefix = "current/legacy-images"
|
||||
+ log.warn("Using legacy d-i based installer, that has been deprecated and will be removed in the future. https://discourse.ubuntu.com/c/server")
|
||||
if self.cache.debian_media_type == "daily":
|
||||
url_prefix = "daily"
|
||||
elif self.cache.debian_media_type == "mounted_iso_url":
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
Description: Clearly mark the LXC connections as being libvirt-lxc, to
|
||||
avoid confusion due to differing features and configurations.
|
||||
Written: 2015-08-22
|
||||
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
|
||||
Updated: 2019-12-06
|
||||
Forwarded: https://github.com/virt-manager/virt-manager/pull/67
|
||||
|
||||
--- a/virtManager/createconn.py
|
||||
+++ b/virtManager/createconn.py
|
||||
@@ -171,7 +171,7 @@ class vmmConnect(vmmGObjectUI):
|
||||
_add_hv_row(HV_QEMU, "qemu", "QEMU/KVM")
|
||||
_add_hv_row(HV_QEMU_SESSION, "qemu", "QEMU/KVM " + _("user session"))
|
||||
_add_hv_row(HV_XEN, "xen", "Xen")
|
||||
- _add_hv_row(HV_LXC, "lxc", "LXC (" + _("Linux Containers") + ")")
|
||||
+ _add_hv_row(HV_LXC, "lxc", "Libvirt-LXC (Linux Containers)")
|
||||
_add_hv_row(HV_BHYVE, "bhyve", "Bhyve")
|
||||
_add_hv_row(HV_VZ, "vz", "Virtuozzo")
|
||||
_add_hv_row(-1, None, "")
|
||||
--- a/virtManager/connection.py
|
||||
+++ b/virtManager/connection.py
|
||||
@@ -433,7 +433,7 @@ class vmmConnection(vmmGObject):
|
||||
"esx": "ESX",
|
||||
"gsx": "GSX",
|
||||
"libxl": "libxl",
|
||||
- "lxc": "LXC",
|
||||
+ "lxc": "Libvirt-LXC",
|
||||
"openvz": "OpenVZ",
|
||||
"phyp": "phyp",
|
||||
"qemu": "QEMU/KVM",
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
Use-usr-bin-python.patch
|
||||
mark-libvirt-lxc.patch
|
||||
legacy-images.patch
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
#!/usr/bin/make -f
|
||||
|
||||
%:
|
||||
dh $@ --with python3 --buildsystem=pybuild
|
||||
|
||||
override_dh_python2:
|
||||
dh_python3 -O--buildsystem=python_distutils
|
||||
dh_python3 -p virtinst usr/share/virt-manager
|
||||
|
||||
override_dh_auto_test:
|
||||
ifneq (,$(filter check,$(DEB_BUILD_OPTIONS)))
|
||||
python3 setup.py test
|
||||
else
|
||||
@echo "Checks disabled atm"
|
||||
endif
|
||||
|
||||
override_dh_auto_install:
|
||||
python3 setup.py --no-update-icon-cache --no-compile-schemas install --force --root=debian/tmp --no-compile -O0
|
||||
dh_install debian/10_virt-manager.gschema.override \
|
||||
/usr/share/glib-2.0/schemas/
|
||||
|
||||
override_dh_auto_clean:
|
||||
dh_auto_clean
|
||||
rm -f data/gschemas.compiled
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
include:
|
||||
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
|
||||
- https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
|
||||
|
||||
|
|
@ -0,0 +1 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
Tests: help.sh
|
||||
Restrictions: superficial
|
||||
Depends: virtinst,
|
||||
|
||||
Tests: virt-manager.sh
|
||||
Restrictions: superficial
|
||||
Depends: virt-manager,
|
||||
xvfb,
|
||||
xauth,
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
#!/bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# At least check we can execute the main binary
|
||||
# to catch missing python dependenies
|
||||
for p in install xml convert clone; do
|
||||
virt-$p --help
|
||||
done
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
#!/bin/sh
|
||||
|
||||
# At least check we can execute the main binary
|
||||
# to catch missing python dependenies
|
||||
|
||||
set -e
|
||||
|
||||
xvfb-run virt-manager --help
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
usr/bin/virt-manager
|
||||
usr/share/man/man1/virt-manager.1
|
||||
usr/share/icons/
|
||||
usr/share/appdata/virt-manager.appdata.xml
|
||||
usr/share/applications
|
||||
usr/share/glib-2.0
|
||||
usr/share/locale
|
||||
usr/share/virt-manager/icons
|
||||
usr/share/virt-manager/ui
|
||||
usr/share/virt-manager/virt-manager
|
||||
usr/share/virt-manager/virtManager
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
usr/bin/virt-clone
|
||||
usr/bin/virt-convert
|
||||
usr/bin/virt-install
|
||||
usr/bin/virt-xml
|
||||
usr/share/bash-completion/completions/
|
||||
usr/share/man/man1/virt-install.1
|
||||
usr/share/man/man1/virt-convert.1
|
||||
usr/share/man/man1/virt-clone.1
|
||||
usr/share/man/man1/virt-xml.1
|
||||
usr/share/virt-manager/virt-clone
|
||||
usr/share/virt-manager/virt-convert
|
||||
usr/share/virt-manager/virt-install
|
||||
usr/share/virt-manager/virt-xml
|
||||
usr/share/virt-manager/virtconv
|
||||
usr/share/virt-manager/virtinst
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
version=3
|
||||
|
||||
https://releases.pagure.org/virt-manager/virt-manager-(.*)\.tar\.gz
|
||||
Loading…
Reference in New Issue