commit 2e1267fa879339ec67e8696f62c7939572b8b352
Author: Jakub Bogusz <[email protected]>
Date: Sun Nov 1 21:58:44 2015 +0100
- up to 4.6.0 (4.5.x left on xen-4.5 branch)
- updated no_Werror patch
- removed obsolete dumpdir,gawk patches
- blktap1 has been dropped, removed obsolete blktapctrl systemd files
- added link patch
blktapctrl.service | 16 ----------
blktapctrl.sysconfig | 1 -
xen-dumpdir.patch | 49 -----------------------------
xen-gawk.patch | 11 -------
xen-link.patch | 11 +++++++
xen-no_Werror.patch | 10 ------
xen.spec | 87 +++++++++++++++++++++++++---------------------------
7 files changed, 52 insertions(+), 133 deletions(-)
---
diff --git a/xen.spec b/xen.spec
index 2b7a6b7..dd2f74d 100644
--- a/xen.spec
+++ b/xen.spec
@@ -21,7 +21,6 @@
%bcond_without hypervisor # Xen hypervisor build
%bcond_without stubdom # stubdom build
%bcond_without xsm # XSM security module (by default,
Flask)
-%bcond_without blktap1 # blktap1 support
%ifnarch %{x8664} arm
%undefine with_hypervisor
@@ -42,12 +41,12 @@
Summary: Xen - a virtual machine monitor
Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej
Name: xen
-Version: 4.5.1
+Version: 4.6.0
Release: 0.1
License: GPL v2, interface parts on BSD-like
Group: Applications/System
Source0:
http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: d12dc9e5e8bd22a68b5c7f53119221f1
+# Source0-md5: 48e232f90927c08326a7b52bb06f49bc
# used by stubdoms
Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz
# Source10-md5: 36cc57650cffda9a0269493be2a169bb
@@ -69,8 +68,6 @@ Source19:
ftp://ftp.gmplib.org/pub/gmp-%{gmp_version}/gmp-%{gmp_version}.tar.bz2
# Source19-md5: dd60683d7057917e34630b4a787932e8
#Source30: proc-xen.mount
#Source31: var-lib-xenstored.mount
-Source32: blktapctrl.service
-Source33: blktapctrl.sysconfig
#Source34: xenconsoled.service
# XXX: upstream xenconsoled expects xencommons
Source35: xenconsoled.sysconfig
@@ -100,10 +97,9 @@ Patch0: %{name}-python_scripts.patch
Patch1: %{name}-symbols.patch
Patch2: %{name}-curses.patch
Patch3: pygrubfix.patch
-Patch6: %{name}-dumpdir.patch
+Patch4: %{name}-link.patch
# Warning: this disables ingress filtering implemented in xen scripts!
Patch7: %{name}-net-disable-iptables-on-bridge.patch
-Patch9: %{name}-gawk.patch
Patch10: %{name}-qemu.patch
Patch12: %{name}-doc.patch
Patch13: %{name}-paths.patch
@@ -398,9 +394,8 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z
firmware
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch6 -p1
+%patch4 -p1
%patch7 -p1
-%patch9 -p1
%patch10 -p1
%patch12 -p1
%patch13 -p1
@@ -446,7 +441,6 @@ export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
ac_cv_lib_gcrypt_gcry_md_hash_buffer=no \
ac_cv_lib_iconv_libiconv_open=no \
- %{__enable_disable blktap1 blktap1} \
--disable-debug \
%{__enable_disable qemu_traditional qemu-traditional} \
--with-system-seabios=/usr/share/seabios/bios.bin \
@@ -468,6 +462,13 @@ unset CFLAGS
unset CXXFLAGS
%if %{with stubdom}
+# hack: MINI-OS_ROOT is not exported properly to submakes because of its name
+echo "MINI-OS_ROOT=$(pwd)/extras/mini-os" >> stubdom/grub/minios.cfg
+echo "MINI-OS_ROOT=$(pwd)/extras/mini-os" >> stubdom/xenstore-minios.cfg
+echo "MINI-OS_ROOT=$(pwd)/extras/mini-os" >> stubdom/vtpm/minios.cfg
+echo "MINI-OS_ROOT=$(pwd)/extras/mini-os" >> stubdom/vtpmmgr/minios.cfg
+echo "MINI-OS_ROOT=$(pwd)/extras/mini-os" >> stubdom/ioemu-minios.cfg
+
%{__make} -j1 dist-stubdom \
%{!?with_ocaml:OCAML_TOOLS=n} \
XSM_ENABLE=%{?with_xsm:y}%{!?with_xsm:n} \
@@ -497,12 +498,11 @@ ln -s %{_prefix}/lib/%{name}/bin/qemu-dm
$RPM_BUILD_ROOT%{_libdir}/%{name}/bin/q
%endif
%endif
+# not noarch
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/pkgconfig $RPM_BUILD_ROOT%{_pkgconfigdir}
+
#install %{SOURCE30} $RPM_BUILD_ROOT%{systemdunitdir}/proc-xen.mount
#install %{SOURCE31} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-xenstored.mount
-%if %{with blktap1}
-install %{SOURCE32} $RPM_BUILD_ROOT%{systemdunitdir}/blktapctrl.service
-install %{SOURCE33} $RPM_BUILD_ROOT/etc/sysconfig/blktapctrl
-%endif
#install %{SOURCE34} $RPM_BUILD_ROOT%{systemdunitdir}/xenconsoled.service
install %{SOURCE35} $RPM_BUILD_ROOT/etc/sysconfig/xenconsoled
#install %{SOURCE36} $RPM_BUILD_ROOT%{systemdunitdir}/xenstored.service
@@ -534,13 +534,13 @@ sed -e's;@libdir@;%{_libdir};g'
-e's;@target_cpu@;%{_target_cpu};g' \
%{SOURCE58} >
$RPM_BUILD_ROOT/etc/efi-boot/update.d/xen.conf
%endif
-mv $RPM_BUILD_ROOT/etc/xen/{xlexample*,examples}
+%{__mv} $RPM_BUILD_ROOT/etc/xen/{xlexample*,examples}
install %{SOURCE59} $RPM_BUILD_ROOT%{_sysconfdir}/xen/scripts/vif-openvswitch
# for %%doc
install -d _doc
-for tool in blktap blktap2 pygrub xenmon ; do
+for tool in blktap2 pygrub ; do
cp -p tools/$tool/README _doc/README.$tool
done
@@ -631,10 +631,6 @@ fi
%{systemdunitdir}/xenstored_ro.socket
%{systemdunitdir}/xendomains.service
%{systemdunitdir}/xen-qemu-dom0-disk-backend.service
-%if %{with blktap1}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/sysconfig/blktapctrl
-%{systemdunitdir}/blktapctrl.service
-%endif
%dir %{_sysconfdir}/xen
%dir %{_sysconfdir}/xen/auto
%dir %{_sysconfdir}/xen/examples
@@ -644,18 +640,15 @@ 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
-%config(noreplace) %verify(not md5 mtime size)
/etc/udev/rules.d/xen-backend.rules
%attr(755,root,root) %{_bindir}/pygrub
%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}/xenalyze
%attr(755,root,root) %{_bindir}/xencons
%attr(755,root,root) %{_bindir}/xencov_split
-%attr(755,root,root) %{_bindir}/xentrace*
-%if %{with blktap1}
-%attr(755,root,root) %{_sbindir}/blktapctrl
-%endif
+%attr(755,root,root) %{_bindir}/xentrace_format
%if %{with xsm}
%attr(755,root,root) %{_sbindir}/flask-*
%endif
@@ -681,7 +674,9 @@ fi
%attr(755,root,root) %{_sbindir}/xenpmd
%attr(755,root,root) %{_sbindir}/xenstored
%attr(755,root,root) %{_sbindir}/xentop
+%attr(755,root,root) %{_sbindir}/xentrace
%attr(755,root,root) %{_sbindir}/xentrace_setmask
+%attr(755,root,root) %{_sbindir}/xentrace_setsize
%attr(755,root,root) %{_sbindir}/xenwatchdogd
%attr(755,root,root) %{_sbindir}/xl
%dir %{_libdir}/%{name}
@@ -708,9 +703,6 @@ fi
%{_prefix}/lib/%{name}/boot/xenstore-stubdom.gz
%endif
%attr(744,root,root) %{_prefix}/lib/%{name}/boot/hvmloader
-%{_mandir}/man1/xenstore-chmod.1*
-%{_mandir}/man1/xenstore-ls.1*
-%{_mandir}/man1/xenstore.1*
%{_mandir}/man1/xentop.1*
%{_mandir}/man1/xentrace_format.1*
%{_mandir}/man1/xl.1*
@@ -732,14 +724,22 @@ fi
%files guest
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xen-detect
-%attr(755,root,root) %{_bindir}/xenstore*
+%attr(755,root,root) %{_bindir}/xenstore
+%attr(755,root,root) %{_bindir}/xenstore-chmod
+%attr(755,root,root) %{_bindir}/xenstore-control
+%attr(755,root,root) %{_bindir}/xenstore-exists
+%attr(755,root,root) %{_bindir}/xenstore-list
+%attr(755,root,root) %{_bindir}/xenstore-ls
+%attr(755,root,root) %{_bindir}/xenstore-read
+%attr(755,root,root) %{_bindir}/xenstore-rm
+%attr(755,root,root) %{_bindir}/xenstore-watch
+%attr(755,root,root) %{_bindir}/xenstore-write
+%{_mandir}/man1/xenstore.1*
+%{_mandir}/man1/xenstore-chmod.1*
+%{_mandir}/man1/xenstore-ls.1*
%files libs
%defattr(644,root,root,755)
-%if %{with blktap1}
-%attr(755,root,root) %{_libdir}/libblktap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libblktap.so.3.0
-%endif
%attr(755,root,root) %{_libdir}/libblktapctl.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libblktapctl.so.1.0
%attr(755,root,root) %{_libdir}/libfsimage.so.*.*.*
@@ -747,17 +747,17 @@ fi
%attr(755,root,root) %{_libdir}/libvhd.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libvhd.so.1.0
%attr(755,root,root) %{_libdir}/libxenctrl.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.5
+%attr(755,root,root) %ghost %{_libdir}/libxenctrl.so.4.6
%attr(755,root,root) %{_libdir}/libxenguest.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.5
+%attr(755,root,root) %ghost %{_libdir}/libxenguest.so.4.6
%attr(755,root,root) %{_libdir}/libxenlight.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.5
+%attr(755,root,root) %ghost %{_libdir}/libxenlight.so.4.6
%attr(755,root,root) %{_libdir}/libxenstat.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libxenstat.so.0
%attr(755,root,root) %{_libdir}/libxenvchan.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libxenvchan.so.1.0
%attr(755,root,root) %{_libdir}/libxlutil.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.3
+%attr(755,root,root) %ghost %{_libdir}/libxlutil.so.4.6
%dir %{_libdir}/fs
%dir %{_libdir}/fs/ext2fs-lib
%dir %{_libdir}/fs/fat
@@ -775,9 +775,6 @@ fi
%files devel
%defattr(644,root,root,755)
-%if %{with blktap1}
-%attr(755,root,root) %{_libdir}/libblktap.so
-%endif
%attr(755,root,root) %{_libdir}/libblktapctl.so
%attr(755,root,root) %{_libdir}/libfsimage.so
%attr(755,root,root) %{_libdir}/libvhd.so
@@ -791,9 +788,6 @@ fi
%{_includedir}/_libxl_list.h
%{_includedir}/_libxl_types.h
%{_includedir}/_libxl_types_json.h
-%if %{with blktap1}
-%{_includedir}/blktaplib.h
-%endif
%{_includedir}/fsimage*.h
%{_includedir}/libxenvchan.h
%{_includedir}/libxl*.h
@@ -801,12 +795,11 @@ fi
%{_includedir}/xs*.h
%{_includedir}/xen
%{_includedir}/xenstore-compat
+%{_pkgconfigdir}/xenlight.pc
+%{_pkgconfigdir}/xlutil.pc
%files static
%defattr(644,root,root,755)
-%if %{with blktap1}
-%{_libdir}/libblktap.a
-%endif
%{_libdir}/libblktapctl.a
%{_libdir}/libvhd.a
%{_libdir}/libxenctrl.a
@@ -871,8 +864,10 @@ fi
%files -n python-xen
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/fsimage.so
+%dir %{py_sitedir}/xen
%dir %{py_sitedir}/xen/lowlevel
%attr(755,root,root) %{py_sitedir}/xen/lowlevel/xc.so
+%{py_sitedir}/xen/migration
%{py_sitedir}/grub
%if "%{py_ver}" > "2.4"
%{py_sitedir}/pygrub-0.3-py*.egg-info
diff --git a/blktapctrl.service b/blktapctrl.service
deleted file mode 100644
index b5c7c2c..0000000
--- a/blktapctrl.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=blktapctrl daemon
-Requires=proc-xen.mount
-After=proc-xen.mount
-RefuseManualStop=true
-ConditionPathExists=/proc/xen
-
-[Service]
-Type=forking
-Environment=BLKTAPCTRL_ARGS=
-EnvironmentFile=-/etc/sysconfig/blktapctrl
-ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
-ExecStart=/usr/sbin/blktapctrl $BLKTAPCTRL_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/blktapctrl.sysconfig b/blktapctrl.sysconfig
deleted file mode 100644
index bb6c09d..0000000
--- a/blktapctrl.sysconfig
+++ /dev/null
@@ -1 +0,0 @@
-#BLKTAPCTRL_ARGS=
diff --git a/xen-dumpdir.patch b/xen-dumpdir.patch
deleted file mode 100644
index 771dec0..0000000
--- a/xen-dumpdir.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up xen-3.4.0/tools/Makefile.dump xen-3.4.0/tools/Makefile
---- xen-3.4.0/tools/Makefile.dump 2009-05-18 13:05:38.000000000 +0200
-+++ xen-3.4.0/tools/Makefile 2009-05-20 17:03:26.000000000 +0200
-@@ -46,7 +46,7 @@ all: subdirs-all
-
- .PHONY: install
- install: subdirs-install
-- $(INSTALL_DIR) $(DESTDIR)/var/xen/dump
-+ $(INSTALL_DIR) $(DESTDIR)/var/lib/xen/dump
- $(INSTALL_DIR) $(DESTDIR)/var/log/xen
- $(INSTALL_DIR) $(DESTDIR)/var/lib/xen
- $(INSTALL_DIR) $(DESTDIR)/var/lock/subsys
---- xen-4.5.1/tools/libxl/xl_cmdimpl.c.orig 2015-06-22 15:41:35.000000000
+0200
-+++ xen-4.5.1/tools/libxl/xl_cmdimpl.c 2015-10-01 17:45:14.267331067 +0200
-@@ -2092,7 +2092,7 @@
- char *corefile;
- int rc;
-
-- if (asprintf(&corefile, "/var/xen/dump/%s", d_config->c_info.name) <
0) {
-+ if (asprintf(&corefile, "/var/lib/xen/dump/%s",
d_config->c_info.name) < 0) {
- LOG("failed to construct core dump path");
- } else {
- LOG("dumping core to %s", corefile);
---- xen-4.5.1/docs/man/xl.cfg.pod.5.orig 2015-06-22 15:41:35.000000000
+0200
-+++ xen-4.5.1/docs/man/xl.cfg.pod.5 2015-10-01 17:46:38.750661228 +0200
-@@ -298,12 +298,12 @@
-
- =item B<coredump-destroy>
-
--write a "coredump" of the domain to F</var/xen/dump/NAME> and then
-+write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
- destroy the domain.
-
- =item B<coredump-restart>
-
--write a "coredump" of the domain to F</var/xen/dump/NAME> and then
-+write a "coredump" of the domain to F</var/lib/xen/dump/NAME> and then
- restart the domain.
-
- =back
-@@ -1605,7 +1605,7 @@
- =head1 FILES
-
- F</etc/xen/NAME.cfg>
--F</var/xen/dump/NAME>
-+F</var/lib/xen/dump/NAME>
-
- =head1 BUGS
-
diff --git a/xen-gawk.patch b/xen-gawk.patch
deleted file mode 100644
index 1b217cc..0000000
--- a/xen-gawk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xen-4.4.1/tools/flask/policy/Makefile.orig 2014-10-22 22:35:07.033124118
+0200
-+++ xen-4.4.1/tools/flask/policy/Makefile 2014-10-22 22:42:54.523104517
+0200
-@@ -86,7 +86,7 @@
- MODENABLED := on
-
- # extract settings from modules.conf
--ENABLED_MODS := $(foreach mod,$(shell awk '/^[[:blank:]]*[[:alpha:]]/{ if
($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst
./,,$(shell find -iname $(mod).te)))
-+ENABLED_MODS := $(foreach mod,$(shell gawk '/^[[:blank:]]*[[:alpha:]]/{ if
($$3 == "$(MODENABLED)") print $$1 }' $(MOD_CONF) 2> /dev/null),$(subst
./,,$(shell find -iname $(mod).te)))
-
- ALL_MODULES := $(filter $(ENABLED_MODS),$(DETECTED_MODS))
-
diff --git a/xen-link.patch b/xen-link.patch
new file mode 100644
index 0000000..e7a77cc
--- /dev/null
+++ b/xen-link.patch
@@ -0,0 +1,11 @@
+--- xen-4.6.0/tools/xenstat/libxenstat/Makefile.orig 2015-10-05
16:33:39.000000000 +0200
++++ xen-4.6.0/tools/xenstat/libxenstat/Makefile 2015-11-01
15:58:56.813622968 +0100
+@@ -34,7 +34,7 @@
+ CFLAGS+=-fPIC
+ CFLAGS+=-Isrc $(CFLAGS_libxenctrl) $(CFLAGS_libxenstore) $(CFLAGS_xeninclude)
-include $(XEN_ROOT)/tools/config.h
+
+-LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl)
++LDLIBS-y = $(LDLIBS_libxenstore) $(LDLIBS_libxenctrl) -lyajl
+ LDLIBS-$(CONFIG_SunOS) += -lkstat
+
+ .PHONY: all
diff --git a/xen-no_Werror.patch b/xen-no_Werror.patch
index 9f93106..16ceeda 100644
--- a/xen-no_Werror.patch
+++ b/xen-no_Werror.patch
@@ -10,13 +10,3 @@ diff -dur -x '*~' xen-4.1.2.orig/Config.mk
xen-4.1.2/Config.mk
HOSTCFLAGS += -fno-strict-aliasing
DISTDIR ?= $(XEN_ROOT)/dist
---- xen-4.4.1/tools/blktap/drivers/Makefile~ 2014-09-02 08:20:19.000000000
+0200
-+++ xen-4.4.1/tools/blktap/drivers/Makefile 2014-12-13 19:19:17.070688454
+0100
-@@ -4,7 +4,6 @@
- IBIN = blktapctrl tapdisk
- QCOW_UTIL = img2qcow qcow2raw qcow-create
-
--CFLAGS += -Werror
- CFLAGS += -Wno-unused
- CFLAGS += -I../lib
- CFLAGS += $(CFLAGS_libxenctrl)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xen.git/commitdiff/2e1267fa879339ec67e8696f62c7939572b8b352
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
