[packages/xen/DEVEL-4.15] - updated to 4.15.2 - updated link patch - removed obsolete link,sysmacros patches
qboosh
qboosh at pld-linux.org
Sat Jun 11 19:57:57 CEST 2022
commit 6a901662979fb12c134de98b10b89ebc4832bf23
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Jun 11 19:59:03 2022 +0200
- updated to 4.15.2
- updated link patch
- removed obsolete link,sysmacros patches
link.patch | 10 ----------
sysmacros.patch | 11 -----------
xen-link.patch | 23 +++++++++++------------
xen-paths.patch | 14 ++++++--------
xen.spec | 26 ++++++++++++--------------
5 files changed, 29 insertions(+), 55 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index e37032d..8023bb5 100644
--- a/xen.spec
+++ b/xen.spec
@@ -42,13 +42,13 @@
Summary: Xen - a virtual machine monitor
Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej
Name: xen
-Version: 4.14.5
+Version: 4.15.2
Release: 1
License: GPL v2, interface parts on BSD-like
Group: Applications/System
# for available versions see https://www.xenproject.org/developers/teams/hypervisor.html
Source0: https://downloads.xenproject.org/release/xen/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 6e1fa9a902bc760bb00a5bdeef9389ae
+# Source0-md5: d85ce5d677c7713b6b91017d3aa8b68c
# used by stubdoms
Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz
# Source10-md5: 36cc57650cffda9a0269493be2a169bb
@@ -97,9 +97,7 @@ Patch7: %{name}-paths.patch
Patch8: %{name}-no_fetcher.patch
Patch9: %{name}-no_Werror.patch
Patch10: %{name}-stubdom-build.patch
-Patch11: link.patch
Patch12: %{name}-systemd.patch
-Patch13: sysmacros.patch
Patch14: gcc9.patch
Patch15: gcc10.patch
Patch16: ocaml-4.12.patch
@@ -426,9 +424,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p1
%patch12 -p1
-%patch13 -p1
%patch14 -p1
%if %(echo %{cc_version} | cut -d. -f1) >= 10
# -Wno-error=enum-conversion requires gcc 10
@@ -734,6 +730,7 @@ fi
%{_libexecdir}/%{name}/boot/vtpm-stubdom.gz
%{_libexecdir}/%{name}/boot/vtpmmgr-stubdom.gz
%{_libexecdir}/%{name}/boot/xenstore-stubdom.gz
+%{_libexecdir}/%{name}/boot/xenstorepvh-stubdom.gz
%endif
%{_libexecdir}/%{name}/boot/ipxe.bin
%ifarch %{x8664}
@@ -748,6 +745,7 @@ fi
%{_mandir}/man5/xl.conf.5*
%{_mandir}/man5/xl-disk-configuration.5*
%{_mandir}/man5/xl-network-configuration.5*
+%{_mandir}/man5/xl-pci-configuration.5*
%{_mandir}/man5/xlcpupool.cfg.5*
%{_mandir}/man7/xen-pci-device-reservations.7*
%{_mandir}/man7/xen-pv-channel.7*
@@ -790,11 +788,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.14
+%attr(755,root,root) %ghost %{_libdir}/libxenfsimage.so.4.15
%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.14
+%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.15
%attr(755,root,root) %{_libdir}/libxendevicemodel.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxendevicemodel.so.1
%attr(755,root,root) %{_libdir}/libxenevtchn.so.*.*
@@ -804,21 +802,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.14
+%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.15
%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.14
+%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.15
%attr(755,root,root) %{_libdir}/libxenstat.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenstat.so.4.14
+%attr(755,root,root) %ghost %{_libdir}/libxenstat.so.4.15
%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.14
+%attr(755,root,root) %ghost %{_libdir}/libxenvchan.so.4.15
%attr(755,root,root) %{_libdir}/libxlutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.14
+%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.15
%dir %{_libdir}/xenfsimage
%dir %{_libdir}/xenfsimage/ext2fs-lib
%dir %{_libdir}/xenfsimage/fat
@@ -1001,7 +999,7 @@ fi
%files -n bash-completion-%{name}
%defattr(644,root,root,755)
-/etc/bash_completion.d/xl.sh
+/etc/bash_completion.d/xl
%if %{with efi}
%files efi
diff --git a/link.patch b/link.patch
deleted file mode 100644
index 28c12e3..0000000
--- a/link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xen-4.6.1/tools/xenstat/libxenstat/Makefile~ 2016-02-09 23:44:19.000000000 +0900
-+++ xen-4.6.1/tools/xenstat/libxenstat/Makefile 2016-04-08 23:28:51.182021927 +0900
-@@ -24,6 +24,7 @@
- LIB=src/libxenstat.a
- SHLIB=src/libxenstat.so.$(MAJOR).$(MINOR)
- SHLIB_LINKS=src/libxenstat.so.$(MAJOR) src/libxenstat.so
-+SHLIB_LDFLAGS += -lyajl
- OBJECTS-y=src/xenstat.o src/xenstat_qmp.o
- OBJECTS-$(CONFIG_Linux) += src/xenstat_linux.o
- OBJECTS-$(CONFIG_SunOS) += src/xenstat_solaris.o
diff --git a/sysmacros.patch b/sysmacros.patch
deleted file mode 100644
index 02eeb53..0000000
--- a/sysmacros.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -urNp -x '*.orig' xen-4.13.1.org/tools/libxl/libxl_internal.h xen-4.13.1/tools/libxl/libxl_internal.h
---- xen-4.13.1.org/tools/libxl/libxl_internal.h 2020-05-14 14:19:32.000000000 +0200
-+++ xen-4.13.1/tools/libxl/libxl_internal.h 2021-03-25 22:42:35.034240136 +0100
-@@ -39,6 +39,7 @@
- #include <unistd.h>
- #include <ctype.h>
-
-+#include <sys/sysmacros.h>
- #include <sys/mman.h>
- #include <poll.h>
- #include <sys/select.h>
diff --git a/xen-link.patch b/xen-link.patch
index e5a7564..82f84c0 100644
--- a/xen-link.patch
+++ b/xen-link.patch
@@ -1,12 +1,11 @@
-diff -urNp -x '*.orig' xen-4.13.1.org/tools/libxc/Makefile xen-4.13.1/tools/libxc/Makefile
---- xen-4.13.1.org/tools/libxc/Makefile 2020-05-14 14:19:32.000000000 +0200
-+++ xen-4.13.1/tools/libxc/Makefile 2021-03-25 22:42:13.577696791 +0100
-@@ -274,7 +274,7 @@ xc_dom_bzimageloader.opic: CFLAGS += $(f
-
- libxenguest.so.$(MAJOR).$(MINOR): COMPRESSION_LIBS = $(filter -l%,$(zlib-options))
- libxenguest.so.$(MAJOR).$(MINOR): $(GUEST_PIC_OBJS) libxenctrl.so
-- $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
-+ $(CC) $(LDFLAGS) -Wl,$(SONAME_LDFLAG) -Wl,libxenguest.so.$(MAJOR) $(SHLIB_LDFLAGS) -o $@ $(GUEST_PIC_OBJS) $(COMPRESSION_LIBS) -lz $(LDLIBS_libxenevtchn) $(LDLIBS_libxenctrl) $(LDLIBS_libxencall) $(LDLIBS_libxenforeignmemory) $(LDLIBS_libxentoollog) $(PTHREAD_LIBS) $(APPEND_LDFLAGS)
-
- -include $(DEPS_INCLUDE)
-
+--- xen-4.15.2/tools/libs/uselibs.mk.orig 2022-01-31 10:42:09.000000000 +0100
++++ xen-4.15.2/tools/libs/uselibs.mk 2022-06-11 17:42:08.053614271 +0200
+@@ -19,7 +19,7 @@ USELIBS_hypfs := toollog toolcore call
+ LIBS_LIBS += ctrl
+ USELIBS_ctrl := toollog call evtchn gnttab foreignmemory devicemodel
+ LIBS_LIBS += guest
+-USELIBS_guest := evtchn ctrl
++USELIBS_guest := evtchn ctrl toollog call foreignmemory
+ LIBS_LIBS += store
+ USELIBS_store := toolcore
+ LIBS_LIBS += vchan
diff --git a/xen-paths.patch b/xen-paths.patch
index 0e3b9f2..d8a4dfe 100644
--- a/xen-paths.patch
+++ b/xen-paths.patch
@@ -1,12 +1,10 @@
-diff -urNp -x '*.orig' xen-4.13.1.org/tools/Makefile xen-4.13.1/tools/Makefile
---- xen-4.13.1.org/tools/Makefile 2020-05-14 14:19:32.000000000 +0200
-+++ xen-4.13.1/tools/Makefile 2021-03-25 22:42:23.177642067 +0100
-@@ -243,7 +243,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-fi
- $(QEMU_XEN_ENABLE_DEBUG) \
+--- xen-4.15.1/tools/Makefile.orig 2021-11-09 17:01:44.785575980 +0100
++++ xen-4.15.1/tools/Makefile 2021-11-09 20:32:30.967065733 +0100
+@@ -237,6 +237,7 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-fi
$$enable_trace_backend \
- --prefix=$(LIBEXEC) \
-- --libdir=$(LIBEXEC_LIB) \
-+ --libdir=$(LIBEXEC_LIB) --libexecdir=$(LIBEXEC_LIB) \
+ --prefix=$(prefix) \
+ --libdir=$(LIBEXEC_LIB) \
++ --libexecdir=$(LIBEXEC_LIB) \
--includedir=$(LIBEXEC_INC) \
--extra-cflags="-DXC_WANT_COMPAT_EVTCHN_API=1 \
-DXC_WANT_COMPAT_GNTTAB_API=1 \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/6a901662979fb12c134de98b10b89ebc4832bf23
More information about the pld-cvs-commit
mailing list