[packages/xen] - drop qemu_traditional and python2, both actively phased out by upstream

baggins baggins at pld-linux.org
Sun Apr 26 14:00:44 CEST 2026


commit b9e0b0c86ff5a0e2b54a62faf1c783c6722461f0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 26 16:00:08 2026 +0200

    - drop qemu_traditional and python2, both actively phased out by upstream

 xen.spec | 80 ----------------------------------------------------------------
 1 file changed, 80 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index 3ae32ff..72aad94 100644
--- a/xen.spec
+++ b/xen.spec
@@ -10,7 +10,6 @@
 #  - mini-os objects are relinked on install (because of .PHONY rules used to make them)
 #
 # Conditional build:
-%bcond_with	qemu_traditional	# without qemu-xen-traditional
 %bcond_without	opengl			# OpenGL support in Xen qemu
 %bcond_without	sdl			# SDL support in Xen qemu
 %bcond_without	bluetooth		# bluetooth support in Xen qemu
@@ -18,7 +17,6 @@
 %bcond_with	golang			# Go library
 %bcond_without	ocaml			# Ocaml libraries for Xen tools
 %bcond_without	pv_grub			# pv-grub (deprecated)
-%bcond_with	python2			# CPython 2.x module instead of 3.x
 %bcond_without	efi			# EFI hypervisor
 %bcond_without	hypervisor		# Xen hypervisor build
 %bcond_without	stubdom			# stubdom build
@@ -145,13 +143,8 @@ BuildRequires:	pandoc
 BuildRequires:	perl-base
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
-%if %{with python2}
-BuildRequires:	python-devel >= 1:2.7
-BuildRequires:	python-markdown
-%else
 BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	python3-markdown
-%endif
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.647
 BuildRequires:	seabios
@@ -164,27 +157,6 @@ BuildRequires:	xz-devel
 BuildRequires:	yajl-devel
 BuildRequires:	zlib-devel
 BuildRequires:	zstd-devel
-%if %{with qemu_traditional}
-%{?with_opengl:BuildRequires:	OpenGL-devel}
-%{?with_sdl:BuildRequires:	SDL-devel >= 1.2.1}
-%{?with_bluetooth:BuildRequires:	bluez-libs-devel}
-%{?with_brlapi:BuildRequires:	brlapi-devel}
-BuildRequires:	gnutls-devel
-BuildRequires:	pciutils-devel
-BuildRequires:	vde2-devel
-# for xfsctl (<xfs/xfs.h>)
-BuildRequires:	xfsprogs-devel
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXext-devel
-%endif
-%if %{with qemu_traditional}
-# FIXME: see qemu configure comments on top of spec
-%{!?with_opengl:BuildConflicts:	OpenGL-devel}
-%{!?with_sdl:BuildConflicts:	SDL-devel}
-%{!?with_sdl:BuildConflicts:	SDL-devel}
-%{!?with_bluetooth:BuildConflicts:	bluez-libs-devel}
-%{!?with_brlapi:BuildConflicts:	brlapi-devel}
-%endif
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{version}-%{release}
@@ -195,11 +167,7 @@ Requires:	gawk
 Requires:	iptables
 Requires:	losetup
 Requires:	net-tools
-%if %{with python2}
-Requires:	python-%{name} = %{version}-%{release}
-%else
 Requires:	python3-%{name} = %{version}-%{release}
-%endif
 Requires:	rc-scripts
 Requires:	sed
 Requires:	systemd-units >= 38
@@ -454,11 +422,7 @@ ln -s %{SOURCE20} tools/firmware/etherboot/ipxe.tar.gz
 mkdir -p extras
 unxz -c %{SOURCE21} | tar xvf - -C extras/
 
-%if %{with python2}
-%{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
-%else
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python3},; 1s,/usr/bin/python2$,%{__python3},' \
-%endif
 	tools/misc/xencov_split \
 	tools/pygrub/src/pygrub \
 	tools/python/scripts/{convert-legacy-stream,verify-stream-v2} \
@@ -491,7 +455,6 @@ export PATH=$(pwd)/our-ld:$PATH
 
 %configure \
 	CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
-	%{?with_python2:PYTHON=%{__python}} \
 	ac_cv_lib_gcrypt_gcry_md_hash_buffer=no \
 	ac_cv_lib_iconv_libiconv_open=no \
 	--disable-debug \
@@ -499,7 +462,6 @@ export PATH=$(pwd)/our-ld:$PATH
 	%{!?with_golang:--disable-golang} \
 	%{?with_pv_grub:--enable-pv-grub} \
 	--enable-ipxe \
-	%{__enable_disable qemu_traditional qemu-traditional} \
 	--enable-systemd%{!?with_systemd:=no} \
 	--with-system-seabios=/usr/share/seabios/bios.bin \
 %ifarch %{x8664}
@@ -512,7 +474,6 @@ export PATH=$(pwd)/our-ld:$PATH
 %endif
 
 export EXTRA_CFLAGS_XEN_TOOLS="%{rpmcflags} -I/usr/include/ncurses"
-export EXTRA_CFLAGS_QEMU_TRADITIONAL="%{rpmcflags} -I/usr/include/ncurses"
 export EXTRA_CFLAGS_QEMU_XEN="%{rpmcflags} -I/usr/include/ncurses"
 
 # exporting these by configure macro break things later
@@ -614,15 +575,8 @@ install %{SOURCE59} $RPM_BUILD_ROOT%{_sysconfdir}/xen/scripts/vif-openvswitch
 install -d _doc
 cp -p tools/pygrub/README _doc/README.pygrub
 
-%if %{with python2}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-
-%py_postclean
-%else
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
-%endif
 
 # remove unneeded files
 %if %{with hypervisor}
@@ -725,10 +679,6 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/README*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/cpupool
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xl.conf
-%if %{with qemu_traditional}
-%attr(755,root,root) %{_bindir}/qemu-img-xen
-%attr(755,root,root) %{_bindir}/qemu-nbd-xen
-%endif
 %attr(755,root,root) %{_bindir}/vchan-socket-proxy
 %attr(755,root,root) %{_bindir}/xen-cpuid
 %attr(755,root,root) %{_bindir}/xenalyze
@@ -759,9 +709,6 @@ fi
 %attr(744,root,root) %{_libexecdir}/%{name}/bin/*
 %dir %{_libexecdir}/%{name}/boot
 %if %{with stubdom}
-%if %{with qemu_traditional}
-%{_libexecdir}/%{name}/boot/ioemu-stubdom.gz
-%endif
 %if %{with pv_grub}
 %ifarch %{ix86} %{x8664}
 %{_libexecdir}/%{name}/boot/pv-grub-x86_32.gz
@@ -810,9 +757,6 @@ fi
 %{systemdtmpfilesdir}/xenstored.conf
 %dir %attr(0700,root,root) /var/log/xen
 %dir %attr(0700,root,root) /var/log/xen/console
-%if %{with qemu_traditional}
-%{_datadir}/xen
-%endif
 
 %files guest
 %defattr(644,root,root,755)
@@ -990,29 +934,6 @@ fi
 %{_libdir}/ocaml/xsd_glue/*.cm[aixo]*
 %endif
 
-%if %{with python2}
-%files -n python-xen
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/xenfsimage.so
-%dir %{py_sitedir}/xen
-%{py_sitedir}/xen/util.py[co]
-%dir %{py_sitedir}/xen/lowlevel
-%attr(755,root,root) %{py_sitedir}/xen/lowlevel/xc.so
-%{py_sitedir}/xen/migration
-%{py_sitedir}/grub
-%{py_sitedir}/pygrub-*-py*.egg-info
-%{py_sitedir}/xen-*-py*.egg-info
-
-%files -n python-xen-guest
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/xen
-%{py_sitedir}/xen/__init__.py[co]
-%dir %{py_sitedir}/xen/lowlevel
-%{py_sitedir}/xen/lowlevel/__init__.py[co]
-%attr(755,root,root) %{py_sitedir}/xen/lowlevel/xs.so
-
-%else
-
 %files -n python3-xen
 %defattr(644,root,root,755)
 %attr(755,root,root) %{py3_sitedir}/xenfsimage.cpython-*.so
@@ -1037,7 +958,6 @@ fi
 %{py3_sitedir}/xen/lowlevel/__init__.py
 %{py3_sitedir}/xen/lowlevel/__pycache__
 %attr(755,root,root) %{py3_sitedir}/xen/lowlevel/xs.cpython-*.so
-%endif
 
 %files -n bash-completion-%{name}
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/b9e0b0c86ff5a0e2b54a62faf1c783c6722461f0



More information about the pld-cvs-commit mailing list