diff --git a/xen-4.7.0-gcc-6.1.0.patch b/xen-4.7.0-gcc-6.1.0.patch new file mode 100644 index 0000000..228e346 --- /dev/null +++ b/xen-4.7.0-gcc-6.1.0.patch @@ -0,0 +1,23 @@ +diff -Nru xen-4.7.0.orig/tools/firmware/etherboot/patches/series xen-4.7.0/tools/firmware/etherboot/patches/series +--- xen-4.7.0.orig/tools/firmware/etherboot/patches/series 2016-06-20 12:38:15.000000000 +0200 ++++ xen-4.7.0/tools/firmware/etherboot/patches/series 2016-07-23 18:36:18.960739191 +0200 +@@ -4,3 +4,4 @@ + build_fix_3.patch + build-compare.patch + build_fix_4.patch ++xen-4.7.0-gcc-6.1.0.patch +diff -Nru xen-4.7.0.orig/tools/firmware/etherboot/patches/xen-4.7.0-gcc-6.1.0.patch xen-4.7.0/tools/firmware/etherboot/patches/xen-4.7.0-gcc-6.1.0.patch +--- xen-4.7.0.orig/tools/firmware/etherboot/patches/xen-4.7.0-gcc-6.1.0.patch 1970-01-01 01:00:00.000000000 +0100 ++++ xen-4.7.0/tools/firmware/etherboot/patches/xen-4.7.0-gcc-6.1.0.patch 2016-07-23 18:23:50.625305190 +0200 +@@ -0,0 +1,11 @@ ++--- ipxe/src/Makefile.orig 2016-07-22 17:36:50.011196369 +0200 +++++ ipxe/src/Makefile 2016-07-22 17:30:08.345532878 +0200 ++@@ -165,7 +165,7 @@ ++ CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) \ ++ -DVERSION_MINOR=$(VERSION_MINOR) \ ++ -DVERSION_PATCH=$(VERSION_PATCH) \ ++- -DVERSION=\"$(VERSION)\" +++ -DVERSION=\"$(VERSION)\" -Wno-error=nonnull-compare -Wno-error=unused-const-variable -Wno-error=shift-negative-value -Wno-error=array-bounds -Wno-error=tautological-compare ++ IDENT = '$(@F) $(VERSION) (GPL) ipxe.org' ++ version : ++ @$(ECHO) $(VERSION) diff --git a/xen.spec b/xen.spec index 7ed5653..d1e4826 100644 --- a/xen.spec +++ b/xen.spec @@ -1,7 +1,7 @@ %define bigver %(echo %version | cut -d. -f1) %define majver %(echo %version | cut -d. -f1-2) Name: xen -Version: 4.2.2 +Version: 4.7.0 Release: 1mamba Summary: An high performing server virtualization software Group: Applications/Emulators @@ -18,36 +18,66 @@ Patch3: xen-4.2.2-qemu-texinfo-5.patch Patch4: xen-4.2.2-qemu-configure.patch Patch5: xen-4.2.2-gcc-4.7.patch Patch6: xen-4.2.2-qemu-remove-CFLAGS.patch +Patch7: xen-4.7.0-gcc-6.1.0.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libGL-devel +BuildRequires: libGLESv2-devel +BuildRequires: libSDL-devel +BuildRequires: libX11-devel +BuildRequires: libXext-devel BuildRequires: libaio-devel +BuildRequires: libatk-devel BuildRequires: libbluetooth-devel BuildRequires: libbzip2-devel -BuildRequires: libcheck-devel +BuildRequires: libcairo-devel +BuildRequires: libcap-devel +BuildRequires: libcap-ng-devel BuildRequires: libcurl-devel BuildRequires: libe2fs-devel -BuildRequires: libGL-devel +BuildRequires: libepoxy-devel +BuildRequires: libffi-devel +BuildRequires: libfontconfig-devel +BuildRequires: libfreetype-devel +BuildRequires: libgcc +BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel +BuildRequires: libgmp-devel BuildRequires: libgnutls-devel +BuildRequires: libgtk2-devel +BuildRequires: libidn-devel BuildRequires: libjpeg-devel BuildRequires: liblzma-devel BuildRequires: liblzo-devel -BuildRequires: libncurses-devel +BuildRequires: libncurses5 +BuildRequires: libnettle-devel +BuildRequires: libnfs-devel +BuildRequires: libnl-devel BuildRequires: libnspr-devel BuildRequires: libnss-devel -BuildRequires: libopenssl-devel +BuildRequires: libp11-kit-devel +BuildRequires: libpango-devel BuildRequires: libpci-devel +BuildRequires: libpcre-devel +BuildRequires: libpixman-devel BuildRequires: libpng-devel -BuildRequires: libpython27-devel BuildRequires: libpython-devel -BuildRequires: libsasl-devel -BuildRequires: libSDL-devel +BuildRequires: libpython27-devel +BuildRequires: libsasl2-devel +BuildRequires: libsnappy-devel +BuildRequires: libspice-devel +BuildRequires: libssh2-devel +BuildRequires: libstdc++6-devel +BuildRequires: libsystemd-devel +BuildRequires: libtasn1-devel +BuildRequires: libusb-devel +BuildRequires: libusbredir-devel BuildRequires: libuuid-devel -BuildRequires: libX11-devel -BuildRequires: libXext-devel +BuildRequires: libvte0-devel BuildRequires: libyajl-devel BuildRequires: libz-devel +BuildRequires: perl-devel ## AUTOBUILDREQ-END BuildRequires: ocaml-findlib Requires: bridge-utils @@ -93,27 +123,33 @@ This package contains the python bindings. %setup -q #-D -T #:<< _EOF -%patch1 -p1 +#%patch1 -p1 #%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +#%patch3 -p1 +#%patch4 -p1 +#%patch5 -p1 +#%patch6 -p1 +%patch7 -p1 %build +#:<< _EOF ld -v | grep gold && { echo "ERROR: gold linker detected, this package requires standard ld; aborting." exit 1 } +export CFLAGS_FIX="$(echo %optflags | sed 's|-m64||g;s|-mtune=generic||g')" %ifarch x86_64 - %make xen + make %{_smp_mflags} xen %else XEN_TARGET_ARCH=x86_64 make %{_smp_mflags} CROSS_COMPILE=x86_64-openmamba-linux-gnu- xen %endif +#_EOF + %configure \ - --disable-ocamltools + --disable-ocamltools \ + --with-systemd=%{_unitdir} %make tools docs -j1 @@ -137,6 +173,8 @@ netbk netloop _EOF +rm -rf %{buildroot}%{_initrddir} + rm -f %{buildroot}%{_sysconfdir}/udev/xend.rules # remove qemu etc, man and doc stuff installed under /usr/local @@ -160,13 +198,9 @@ rm -rf %{buildroot}%{_prefix}/local %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/xencommons %config(noreplace) %{_sysconfdir}/sysconfig/xendomains -%{_sysconfdir}/hotplug/xen-backend.agent +#%{_sysconfdir}/hotplug/xen-backend.agent %{_sysconfdir}/bash_completion.d/xl.sh %{_sysconfdir}/grub.d/07_xen -%{_initrddir}/xen-watchdog -%{_initrddir}/xencommons -%{_initrddir}/xend -%{_initrddir}/xendomains #%{_sysconfdir}/udev/rules.d/xen-backend.rules #%{_sysconfdir}/udev/xen-backend.rules #%{_sysconfdir}/udev/rules.d/xend.rules @@ -176,14 +210,18 @@ rm -rf %{buildroot}%{_prefix}/local /boot/xen-%{version}.gz /boot/xen-%{majver}.gz /boot/xen-%{bigver}.gz +/boot/xen-%{version}.config /boot/xen.gz -/boot/xen-syms-%{version} +#/boot/xen-syms-%{version} %{_bindir}/qemu-img-xen %{_bindir}/qemu-nbd-xen %{_bindir}/pygrub -%{_bindir}/remus +#%{_bindir}/remus +%{_bindir}/xen-cpuid %{_bindir}/xen-detect +%{_bindir}/xenalyze %{_bindir}/xencons +%{_bindir}/xencov_split %{_bindir}/xenstore %{_bindir}/xenstore-chmod %{_bindir}/xenstore-control @@ -194,10 +232,10 @@ rm -rf %{buildroot}%{_prefix}/local %{_bindir}/xenstore-rm %{_bindir}/xenstore-watch %{_bindir}/xenstore-write -%{_bindir}/xentrace +#%{_bindir}/xentrace %{_bindir}/xentrace_format -%{_bindir}/xentrace_setsize -%{_sbindir}/blktapctrl +#%{_bindir}/xentrace_setsize +#%{_sbindir}/blktapctrl %{_sbindir}/flask-getenforce %{_sbindir}/flask-get-bool %{_sbindir}/flask-label-pci @@ -215,7 +253,7 @@ rm -rf %{buildroot}%{_prefix}/local %{_sbindir}/qcow-create %{_sbindir}/qcow2raw %{_sbindir}/tap-ctl -%{_sbindir}/tapdisk +#%{_sbindir}/tapdisk %{_sbindir}/tapdisk-client %{_sbindir}/tapdisk-diff %{_sbindir}/tapdisk-stream @@ -227,13 +265,16 @@ rm -rf %{buildroot}%{_prefix}/local %{_sbindir}/xen-hptool %{_sbindir}/xen-hvmcrash %{_sbindir}/xen-hvmctx +%{_sbindir}/xen-livepatch %{_sbindir}/xen-lowmemd +%{_sbindir}/xen-mfndump %{_sbindir}/xen-tmem-list-parse -%{_sbindir}/xen-python-path +#%{_sbindir}/xen-python-path %{_sbindir}/xen-ringwatch %{_sbindir}/xenbaked %{_sbindir}/xenconsoled -%{_sbindir}/xend +%{_sbindir}/xencov +#%{_sbindir}/xend %{_sbindir}/xenlockprof %{_sbindir}/xenmon.py #%{_sbindir}/xenpaging @@ -242,27 +283,41 @@ rm -rf %{buildroot}%{_prefix}/local %{_sbindir}/xenpmd %{_sbindir}/xenstored %{_sbindir}/xentop -%{_sbindir}/xentrace_setmask +%{_sbindir}/xentrace* %{_sbindir}/xenwatchdogd %{_sbindir}/xl -%{_sbindir}/xm -%{_sbindir}/xsview +#%{_sbindir}/xm +#%{_sbindir}/xsview +%dir %{_libexecdir}/xen +%{_libexecdir}/xen/* +%{_prefix}/lib/debug/xen-syms-4.7.0 +%{_prefix}/lib/modules-load.d/xen.conf +%{_unitdir}/proc-xen.mount +%{_unitdir}/var-lib-xenstored.mount +%{_unitdir}/xen-init-dom0.service +%{_unitdir}/xen-qemu-dom0-disk-backend.service +%{_unitdir}/xen-watchdog.service +%{_unitdir}/xenconsoled.service +%{_unitdir}/xendomains.service +%{_unitdir}/xenstored.service +%{_unitdir}/xenstored.socket +%{_unitdir}/xenstored_ro.socket %{_mandir}/man1/*.gz %{_mandir}/man5/*.gz %{_mandir}/man8/xentrace.8* %ifarch x86_64 -%{_prefix}/lib/xen/bin/qemu-dm -%{_prefix}/lib//xen/bin/qemu-ga -%{_prefix}/lib/xen/bin/qemu-img -%{_prefix}/lib/xen/bin/qemu-io -%{_prefix}/lib/xen/bin/qemu-nbd -%{_prefix}/lib/xen/bin/qemu-system-i386 -%{_prefix}/lib/xen/bin/xenpaging -%{_datadir}/xen/man/man1/qemu-img.1 -%{_datadir}/xen/man/man1/qemu.1 -%{_datadir}/xen/man/man8/qemu-nbd.8 +#%{_prefix}/lib/xen/bin/qemu-dm +#%{_prefix}/lib//xen/bin/qemu-ga +#%{_prefix}/lib/xen/bin/qemu-img +#%{_prefix}/lib/xen/bin/qemu-io +#%{_prefix}/lib/xen/bin/qemu-nbd +#%{_prefix}/lib/xen/bin/qemu-system-i386 +#%{_prefix}/lib/xen/bin/xenpaging +#%{_datadir}/xen/man/man1/qemu-img.1 +#%{_datadir}/xen/man/man1/qemu.1 +#%{_datadir}/xen/man/man8/qemu-nbd.8 %endif -%{_datadir}/xen/create.dtd +#%{_datadir}/xen/create.dtd %dir %{_datadir}/xen %dir %{_datadir}/xen/qemu %{_datadir}/xen/qemu/* @@ -280,30 +335,25 @@ rm -rf %{buildroot}%{_prefix}/local %{_libdir}/fs/ufs/fsimage.so %{_libdir}/fs/xfs/fsimage.so %{_libdir}/fs/zfs/fsimage.so -%{_libdir}/libblktap.so.* +#%{_libdir}/libblktap.so.* %{_libdir}/libblktapctl.so.* #%{_libdir}/libflask.so.* %{_libdir}/libfsimage.so.* %{_libdir}/libvhd.so.* -%{_libdir}/libxenctrl.so.* -%{_libdir}/libxenguest.so.* -%{_libdir}/libxenlight.so.* -%{_libdir}/libxenstat.so.* -%{_libdir}/libxenstore.so.* -%{_libdir}/libxenvchan.so.* +%{_libdir}/libxen*.so.* %{_libdir}/libxlutil.so.* #%{_libdir}/ocaml/site-lib/* -%dir %{_libdir}/xen -%dir %{_libdir}/xen/bin -%{_libdir}/xen/bin/* -%dir %{_prefix}/lib/xen/boot -%{_prefix}/lib/xen/boot/hvmloader +#%dir %{_libdir}/xen +#%dir %{_libdir}/xen/bin +#%{_libdir}/xen/bin/* +#%dir %{_prefix}/lib/xen/boot +#%{_prefix}/lib/xen/boot/hvmloader %files -n libxen-devel %defattr(-,root,root) %{_includedir}/* -%{_libdir}/libblktap.a -%{_libdir}/libblktap.so +#%{_libdir}/libblktap.a +#%{_libdir}/libblktap.so %{_libdir}/libblktapctl.a %{_libdir}/libblktapctl.so #%{_libdir}/libflask.a @@ -311,20 +361,12 @@ rm -rf %{buildroot}%{_prefix}/local %{_libdir}/libfsimage.so %{_libdir}/libvhd.a %{_libdir}/libvhd.so -%{_libdir}/libxenctrl.a -%{_libdir}/libxenctrl.so -%{_libdir}/libxenguest.a -%{_libdir}/libxenguest.so -%{_libdir}/libxenlight.a -%{_libdir}/libxenlight.so -%{_libdir}/libxenstat.a -%{_libdir}/libxenstat.so -%{_libdir}/libxenvchan.a -%{_libdir}/libxenvchan.so -%{_libdir}/libxenstore.a -%{_libdir}/libxenstore.so +%{_libdir}/libx*.a +%{_libdir}/libx*.so %{_libdir}/libxlutil.a %{_libdir}/libxlutil.so +%{_datadir}/pkgconfig/xenlight.pc +%{_datadir}/pkgconfig/xlutil.pc %files -n python-xen %defattr(-,root,root) @@ -336,6 +378,9 @@ rm -rf %{buildroot}%{_prefix}/local %{python_sitearch}/xen-*.egg-info %changelog +* Thu Jul 21 2016 Silvan Calarco 4.7.0-1mamba +- update to 4.7.0 + * Wed May 29 2013 Silvan Calarco 4.2.2-1mamba - update to 4.2.2