[packages/xen] - up to 4.20.3 - qemu_traditional is being removed upstream
baggins
baggins at pld-linux.org
Sun Apr 26 13:58:03 CEST 2026
commit 4d7593cdae505c37c91286884a1f73c982c4bb6b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Apr 26 15:57:26 2026 +0200
- up to 4.20.3
- qemu_traditional is being removed upstream
xen-doc.patch | 36 ------------------------
xen-qemu.patch | 26 ------------------
xen.spec | 87 +++++++++++++++++++++++++++++++++++++---------------------
3 files changed, 56 insertions(+), 93 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index ddd8266..3ae32ff 100644
--- a/xen.spec
+++ b/xen.spec
@@ -10,7 +10,7 @@
# - mini-os objects are relinked on install (because of .PHONY rules used to make them)
#
# Conditional build:
-%bcond_without qemu_traditional # without qemu-xen-traditional
+%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
@@ -44,13 +44,13 @@
Summary: Xen - a virtual machine monitor
Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej
Name: xen
-Version: 4.19.3
+Version: 4.20.3
Release: 1
License: GPL v2, interface parts on BSD-like
Group: Applications/System
# for available versions see https://xenproject.org/xen-project-archives/
Source0: https://downloads.xenproject.org/release/xen/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 51bc571e56576803f988b777b377dbd3
+# Source0-md5: e6aa8d8e170b90d42ca00e961484c90f
# used by stubdoms; Source10-19 versions set in stubdom/configure.ac
Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz
# Source10-md5: 36cc57650cffda9a0269493be2a169bb
@@ -71,6 +71,8 @@ Source19: https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
# ipxe tag set in tools/firmware/etherboot/Makefile
Source20: %{xen_extfiles_url}/ipxe-git-1d1cf74a5e58811822bee4b3da3cff7282fcdfca.tar.gz
# Source20-md5: 0d0dc7451b47f2c7a2992bbec20bf4d0
+Source21: mini-os-4.20.0.tar.xz
+# Source21-md5: cec427938d417fc0bbe7ababb4801df3
Source35: xenconsoled.sysconfig
Source37: xenstored.sysconfig
Source38: xenstored.tmpfiles
@@ -94,8 +96,6 @@ Patch2: %{name}-link.patch
Patch3: pygrubfix.patch
# Warning: this disables ingress filtering implemented in xen scripts!
Patch4: %{name}-net-disable-iptables-on-bridge.patch
-Patch5: %{name}-qemu.patch
-Patch6: %{name}-doc.patch
Patch7: %{name}-paths.patch
Patch8: %{name}-no_fetcher.patch
Patch9: %{name}-no_Werror.patch
@@ -418,34 +418,32 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware
%prep
%setup -q
-%patch -P 0 -p1
-%patch -P 1 -p1
-%patch -P 2 -p1
-%patch -P 3 -p1
-%patch -P 4 -p1
-%patch -P 5 -p1
-%patch -P 6 -p1
-%patch -P 7 -p1
-%patch -P 8 -p1
-%patch -P 9 -p1
-%patch -P 10 -p1
-%patch -P 12 -p1
-%patch -P 14 -p1
+%patch -P0 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+%patch -P7 -p1
+%patch -P8 -p1
+%patch -P9 -p1
+%patch -P10 -p1
+%patch -P12 -p1
+%patch -P14 -p1
%if %(echo %{cc_version} | cut -d. -f1) >= 10
# -Wno-error=enum-conversion requires gcc 10
-%patch -P 15 -p1
+%patch -P15 -p1
%if %(echo %{cc_version} | cut -d. -f1) < 12
# -Wno-error=dangling-pointer requires gcc 12
%{__sed} -i -e 's/ -Wno-error=dangling-pointer//' tools/firmware/etherboot/Config
%endif
%endif
%ifarch %{ix86} %{arm}
-%patch -P 17 -p1
+%patch -P17 -p1
%endif
-%patch -P 18 -p1
+%patch -P18 -p1
%if %(echo %{cc_version} | cut -d. -f1) >= 15
-%patch -P 19 -p1
-%patch -P 20 -p1
+%patch -P19 -p1
+%patch -P20 -p1
%endif
# stubdom sources
@@ -453,6 +451,9 @@ ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
ln -s %{SOURCE17} %{SOURCE18} %{SOURCE19} stubdom
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
@@ -465,6 +466,7 @@ ln -s %{SOURCE20} tools/firmware/etherboot/ipxe.tar.gz
# do not allow fetching anything via git
echo GIT=/bin/false >> Config.mk
+echo DEBUG_DIR=%{_libexecdir}/xen/debug >> Config.mk
%build
# based on the 'autoconf.sh' from the sources
@@ -493,8 +495,10 @@ export PATH=$(pwd)/our-ld:$PATH
ac_cv_lib_gcrypt_gcry_md_hash_buffer=no \
ac_cv_lib_iconv_libiconv_open=no \
--disable-debug \
+ --with-debugdir=%{_libexecdir}/xen/debug \
%{!?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 \
@@ -623,12 +627,15 @@ cp -p tools/pygrub/README _doc/README.pygrub
# remove unneeded files
%if %{with hypervisor}
%{__mv} xen/xen-syms $RPM_BUILD_ROOT/boot/%{name}-syms-%{version}
-%{__rm} $RPM_BUILD_ROOT/boot/xen-4.19.gz
+%{__rm} $RPM_BUILD_ROOT/boot/xen-4.20.gz
%{__rm} $RPM_BUILD_ROOT/boot/xen-4.gz
%endif
%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xen
%{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
+# debugedit: en-4.20.3.efi.elf: Bad string pointer index 13797 for unit name (.debug_line_str)
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/xen/debug/xen-*.efi.*
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -680,6 +687,11 @@ fi
/boot/%{name}-%{version}.config
/boot/%{name}-%{version}.gz
/boot/%{name}.gz
+%ifnarch %{x8664}
+%dir %{_libexecdir}/xen/debug
+%endif
+%{_libexecdir}/xen/debug/xen-syms-%{version}
+%{_libexecdir}/xen/debug/xen-syms-%{version}.map
%endif
%if %{with xsm}
/boot/xenpolicy-%{version}
@@ -766,6 +778,12 @@ fi
%{_libexecdir}/%{name}/boot/ipxe.bin
%ifarch %{x8664}
%{_libexecdir}/%{name}/boot/xen-shim
+%dir %{_libexecdir}/xen/debug
+%dir %{_libexecdir}/xen/debug/%{_prefix}
+%dir %{_libexecdir}/xen/debug/%{_libexecdir}
+%dir %{_libexecdir}/xen/debug/%{_libexecdir}/xen
+%dir %{_libexecdir}/xen/debug/%{_libexecdir}/xen/boot
+%{_libexecdir}/xen/debug/%{_libexecdir}/xen/boot/xen-shim-syms
%endif
%attr(744,root,root) %{_libexecdir}/%{name}/boot/hvmloader
%{_mandir}/man1/xenhypfs.1*
@@ -818,11 +836,11 @@ fi
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libxenfsimage.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenfsimage.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxenfsimage.so.4.20
%attr(755,root,root) %{_libdir}/libxencall.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxencall.so.1
%attr(755,root,root) %{_libdir}/libxenctrl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.20
%attr(755,root,root) %{_libdir}/libxendevicemodel.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxendevicemodel.so.1
%attr(755,root,root) %{_libdir}/libxenevtchn.so.*.*
@@ -832,21 +850,21 @@ fi
%attr(755,root,root) %{_libdir}/libxengnttab.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxengnttab.so.1
%attr(755,root,root) %{_libdir}/libxenguest.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.20
%attr(755,root,root) %{_libdir}/libxenhypfs.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxenhypfs.so.1
%attr(755,root,root) %{_libdir}/libxenlight.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.20
%attr(755,root,root) %{_libdir}/libxenstat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenstat.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxenstat.so.4.20
%attr(755,root,root) %{_libdir}/libxentoolcore.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxentoolcore.so.1
%attr(755,root,root) %{_libdir}/libxentoollog.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxentoollog.so.1
%attr(755,root,root) %{_libdir}/libxenvchan.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenvchan.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxenvchan.so.4.20
%attr(755,root,root) %{_libdir}/libxlutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.19
+%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.20
%dir %{_libdir}/xenfsimage
%dir %{_libdir}/xenfsimage/ext2fs-lib
%dir %{_libdir}/xenfsimage/fat
@@ -940,6 +958,10 @@ fi
%attr(755,root,root) %{_libdir}/ocaml/xeneventchn/dllxeneventchn_stubs.so
%dir %{_libdir}/ocaml/xenmmap
%attr(755,root,root) %{_libdir}/ocaml/xenmmap/dllxenmmap_stubs.so
+%dir %{_libexecdir}/xen/ocaml
+%dir %{_libexecdir}/xen/ocaml/xsd_glue
+%dir %{_libexecdir}/xen/ocaml/xsd_glue/xenctrl_plugin
+%{_libexecdir}/xen/ocaml/xsd_glue/xenctrl_plugin/domain_getinfo_v1.cmxs
%files -n ocaml-xen-devel
%defattr(644,root,root,755)
@@ -963,6 +985,9 @@ fi
%{_libdir}/ocaml/xenstore/META
%{_libdir}/ocaml/xenstore/xenstore.a
%{_libdir}/ocaml/xenstore/*.cm[aixo]*
+%{_libdir}/ocaml/xsd_glue/META
+%{_libdir}/ocaml/xsd_glue/*.a
+%{_libdir}/ocaml/xsd_glue/*.cm[aixo]*
%endif
%if %{with python2}
diff --git a/xen-doc.patch b/xen-doc.patch
deleted file mode 100644
index cb31f89..0000000
--- a/xen-doc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -urNp -x '*.orig' xen-4.13.1.org/tools/qemu-xen-traditional/Makefile xen-4.13.1/tools/qemu-xen-traditional/Makefile
---- xen-4.13.1.org/tools/qemu-xen-traditional/Makefile 2018-10-24 17:18:11.000000000 +0200
-+++ xen-4.13.1/tools/qemu-xen-traditional/Makefile 2021-03-25 22:42:21.257653071 +0100
-@@ -275,7 +275,7 @@ cscope:
-
- # documentation
- %.html: %.texi
-- texi2html -monolithic -number $<
-+ texi2any --html --no-split --number-sections $<
-
- %.info: %.texi
- makeinfo $< -o $@
-diff -urNp -x '*.orig' xen-4.13.1.org/tools/qemu-xen-traditional/configure xen-4.13.1/tools/qemu-xen-traditional/configure
---- xen-4.13.1.org/tools/qemu-xen-traditional/configure 2021-03-25 22:42:20.504324047 +0100
-+++ xen-4.13.1/tools/qemu-xen-traditional/configure 2021-03-25 22:42:21.257653071 +0100
-@@ -1087,7 +1087,7 @@ EOF
- fi
-
- # Check if tools are available to build documentation.
--if [ -x "`which texi2html 2>/dev/null`" ] && \
-+if [ -x "`which texi2any 2>/dev/null`" ] && \
- [ -x "`which pod2man 2>/dev/null`" ]; then
- build_docs="yes"
- fi
-diff -urNp -x '*.orig' xen-4.13.1.org/tools/qemu-xen-traditional/texi2pod.pl xen-4.13.1/tools/qemu-xen-traditional/texi2pod.pl
---- xen-4.13.1.org/tools/qemu-xen-traditional/texi2pod.pl 2018-10-24 17:18:11.000000000 +0200
-+++ xen-4.13.1/tools/qemu-xen-traditional/texi2pod.pl 2021-03-25 22:42:21.257653071 +0100
-@@ -340,6 +340,8 @@ die "No filename or title\n" unless defi
- $sects{NAME} = "$fn \- $tl\n";
- $sects{FOOTNOTES} .= "=back\n" if exists $sects{FOOTNOTES};
-
-+print "=encoding utf8\n";
-+
- for $sect (qw(NAME SYNOPSIS DESCRIPTION OPTIONS ENVIRONMENT FILES
- BUGS NOTES FOOTNOTES SEEALSO AUTHOR COPYRIGHT)) {
- if(exists $sects{$sect}) {
diff --git a/xen-qemu.patch b/xen-qemu.patch
deleted file mode 100644
index 5a2c635..0000000
--- a/xen-qemu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-qemu-xen-traditional/configure: define _GNU_SOURCE for NPTL defs
-qemu-xen/configure: use -O2 for tests to eliminate fortify warnings (-Werror is in effect sometimes)
---- xen-4.2.0/tools/qemu-xen-traditional/configure.orig 2012-09-06 18:05:30.000000000 +0200
-+++ xen-4.2.0/tools/qemu-xen-traditional/configure 2012-10-27 08:16:21.702515768 +0200
-@@ -738,10 +738,10 @@
- #endif
- }
- EOF
-
--if $cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
-+if $cc $ARCH_CFLAGS -D_GNU_SOURCE -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
- :
- else
- nptl="no"
- fi
-
-@@ -788,7 +790,7 @@
- fi
-
- # static link with sdl ?
-- if test "$sdl" = "yes" ; then
-+ if test "$static" = "yes" -a "$sdl" = "yes" ; then
- aa="no"
- `$sdl_config --static-libs 2>/dev/null | grep \\\-laa > /dev/null` && aa="yes"
- sdl_static_libs=`$sdl_config --static-libs 2>/dev/null`
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/4d7593cdae505c37c91286884a1f73c982c4bb6b
More information about the pld-cvs-commit
mailing list