faf078ceda
b8a77805-domain-cpu-Clear-migratable-when-changing-to-custom-cpu.patch
0d84bcfb-cli-Add-iothreadids-attributes-thread_pool_min-and-thread_pool_max.patch
90e13549-Fix-build-with-setuptools-61+.patch
424283ad-launch_security-Use-SEV-ES-policy-0x07-if-host-supports-it.patch
- Modified virtman-add-sev-memory-support.patch
- Renamed upstream patches
virtman-pr381-setuptools-61.patch to
46dc0616-setup-add-bits-for-setuptools-61.patch
virtman-34662fe-argcomplete.patch to
34662fec-tests-Fix-with-latest-argcomplete.patch
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=571
33 lines
1.3 KiB
Diff
33 lines
1.3 KiB
Diff
Subject: Fix build with setuptools 61+
|
|
From: Miro Hrončok miro@hroncok.cz Tue Aug 2 16:39:36 2022 +0200
|
|
Date: Tue Aug 2 12:05:39 2022 -0400:
|
|
Git: 90e13549b4f2dd74b3343a3a28c30f31c20032d5
|
|
|
|
+ ./setup.py configure --default-hvs qemu,xen,lxc
|
|
error: Multiple top-level packages discovered in a flat-layout: ['po', 'ui', 'man', 'data', 'virtinst', 'virtManager'].
|
|
To avoid accidental inclusion of unwanted files or directories,
|
|
setuptools will not proceed with this build.
|
|
If you are trying to create a single distribution with multiple packages
|
|
on purpose, you should not rely on automatic discovery.
|
|
Instead, consider the following options:
|
|
1. set up custom discovery (`find` directive with `include` or `exclude`)
|
|
2. use a `src-layout`
|
|
3. explicitly set `py_modules` or `packages` with a list of names
|
|
To find more information, look for "package discovery" on setuptools docs.
|
|
|
|
Downstream bug report: https://bugzilla.redhat.com/2113754
|
|
diff --git a/setup.py b/setup.py
|
|
index 6a546606..b45d315a 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -530,6 +530,9 @@ setuptools.setup(
|
|
glob.glob("virtinst/install/*.py")),
|
|
],
|
|
|
|
+ # stop setuptools 61+ thinking we want to include everything automatically
|
|
+ py_modules=[],
|
|
+
|
|
cmdclass={
|
|
'build': my_build,
|
|
'build_i18n': my_build_i18n,
|