X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xen.spec;h=2cab02777771cb8464a19dd9e7f9cb553fe5c565;hb=3e18837d6abc7588b0d62c5108b7c96826d2869a;hp=c41e6a2a944f41d63d4c8bb639d180c2f4ad94c0;hpb=705dfc40add34eb420b05bc8d37cf54bb11dfceb;p=packages%2Fxen.git diff --git a/xen.spec b/xen.spec index c41e6a2..2cab027 100644 --- a/xen.spec +++ b/xen.spec @@ -6,20 +6,19 @@ # Xen Makefiles) # - fix %doc - some files are installed in docdir both by make install and %d, # other are installed once +# - 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_without opengl # OpenGL support in Xen qemu -%bcond_without sdl # SDL support in Xen qemu -%bcond_without bluetooth # bluetooth support in Xen qemu -%bcond_without brlapi # brlapi support in Xen qemu -%bcond_without ocaml # Ocaml libraries for Xen tools -%bcond_without efi # EFI hypervisor -%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 -%bcond_without xend # include the obsolete xend & xm +%bcond_without 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 +%bcond_without brlapi # brlapi support in Xen qemu +%bcond_without ocaml # Ocaml libraries for Xen tools +%bcond_without efi # EFI hypervisor +%bcond_without hypervisor # Xen hypervisor build +%bcond_without stubdom # stubdom build +%bcond_without xsm # XSM security module (by default, Flask) %ifnarch %{x8664} arm %undefine with_hypervisor @@ -31,9 +30,6 @@ %undefine with_stubdom %endif -# from Config.mk: -%define seabios_version 1.6.3.2 - # from ./stubdom/configure.ac %define polarssl_version 1.1.4 %define tpm_emulator_version 0.7.4 @@ -43,12 +39,12 @@ Summary: Xen - a virtual machine monitor Summary(pl.UTF-8): Xen - monitor maszyny wirtualnej Name: xen -Version: 4.4.0 -Release: 0.1 +Version: 4.6.5 +Release: 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: fd9031d499af38c5d04108681734027e +# Source0-md5: 63c80317ee662fb237d709d6c4e161c8 # used by stubdoms Source10: %{xen_extfiles_url}/lwip-1.3.0.tar.gz # Source10-md5: 36cc57650cffda9a0269493be2a169bb @@ -62,33 +58,17 @@ Source14: %{xen_extfiles_url}/grub-0.97.tar.gz # Source14-md5: cd3f3eb54446be6003156158d51f4884 Source15: http://xenbits.xen.org/xen-extfiles/ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz # Source15-md5: 7496268cebf47d5c9ccb0696e3b26065 -# http://xenbits.xen.org/git-http/seabios.git/ -# git archive --prefix=tools/firmware/seabios/ --format=tar rel-%{seabios_version} | xz > seabios-%{seabios_version}.tar.xz -Source16: seabios-%{seabios_version}.tar.xz -# Source16-md5: 145e07ff5618a3999f94f2e830d06b05 Source17: %{xen_extfiles_url}/polarssl-%{polarssl_version}-gpl.tgz # Source17-md5: 7b72caf22b01464ee7d6165f2fd85f44 Source18: http://xenbits.xen.org/xen-extfiles/tpm_emulator-%{tpm_emulator_version}.tar.gz # Source18-md5: e26becb8a6a2b6695f6b3e8097593db8 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 Source35: xenconsoled.sysconfig -Source36: xenstored.service Source37: xenstored.sysconfig Source38: xenstored.tmpfiles -Source39: xend.service -Source40: xend.tmpfiles -Source41: xen-watchdog.service -Source42: xen-dom0-modules-load.conf -Source43: xendomains.sh -Source44: xendomains.service # sysvinit scripts -Source50: xend.init +Source46: xen-qemu-dom0-disk-backend.init Source51: xenconsoled.init Source52: xenstored.init Source53: xen-watchdog.init @@ -104,60 +84,62 @@ Patch0: %{name}-python_scripts.patch Patch1: %{name}-symbols.patch Patch2: %{name}-curses.patch Patch3: pygrubfix.patch -Patch4: xend.catchbt.patch -Patch5: xend-pci-loop.patch -Patch6: %{name}-dumpdir.patch # Warning: this disables ingress filtering implemented in xen scripts! Patch7: %{name}-net-disable-iptables-on-bridge.patch -Patch8: %{name}-configure-xend.patch +Patch9: %{name}-gawk.patch Patch10: %{name}-qemu.patch -Patch11: %{name}-ulong.patch Patch12: %{name}-doc.patch Patch13: %{name}-paths.patch Patch14: %{name}-no_fetcher.patch -Patch15: odd-glib2-fix.patch +Patch15: odd-glib2-fix.patch +Patch16: %{name}-gmp-abi.patch +Patch18: %{name}-make.patch +Patch19: %{name}-no_Werror.patch +Patch22: %{name}-stubdom-build.patch +Patch23: link.patch +Patch24: %{name}-systemd.patch +Patch25: fix-misleading-indentation.patch +Patch26: deprecated-readdir_r.patch +Patch27: ipxe-build.patch +Patch28: sysmacros.patch +Patch29: unused-function.patch URL: http://www.xen.org/products/xenhyp.html -%if %{with qemu_traditional} -%{?with_opengl:BuildRequires: OpenGL-devel} -%{?with_sdl:BuildRequires: SDL-devel >= 1.2.1} -%endif +BuildRequires: autoconf >= 2.67 %ifarch %{ix86} %{x8664} BuildRequires: acpica -BuildRequires: autoconf BuildRequires: bcc BuildRequires: bin86 %endif -%if %{with qemu_traditional} -%{?with_bluetooth:BuildRequires: bluez-libs-devel} -%{?with_brlapi:BuildRequires: brlapi-devel} -%endif %{?with_efi:BuildRequires: binutils >= 3:2.23.51.0.3-2} BuildRequires: bzip2-devel -BuildRequires: curl-devel -BuildRequires: cyrus-sasl-devel >= 2 %if %{with xsm} BuildRequires: checkpolicy %endif +BuildRequires: curl-devel +BuildRequires: cyrus-sasl-devel >= 2 BuildRequires: e2fsprogs-devel BuildRequires: gcc >= 6:4.1 -BuildRequires: gettext-devel +%ifarch %{x8664} +BuildRequires: gcc-multilib-32 >= 6:4.1 +%endif +BuildRequires: gettext-tools BuildRequires: glib2-devel >= 1:2.12 -BuildRequires: glusterfs-devel >= 3.4 BuildRequires: gnutls-devel -BuildRequires: keyutils-devel +BuildRequires: keyutils-devel BuildRequires: latex2html >= 2008 BuildRequires: libaio-devel BuildRequires: libcap-devel -BuildRequires: libcap-ng-devel -BuildRequires: libiscsi-devel +%ifarch arm aarch64 +BuildRequires: libfdt-devel +%endif BuildRequires: libjpeg-devel +BuildRequires: libnl-devel >= 3.2.8 BuildRequires: libpng-devel -BuildRequires: libseccomp-devel >= 1.0.0 BuildRequires: libuuid-devel BuildRequires: lzo-devel >= 2 BuildRequires: ncurses-devel %if %{with ocaml} -BuildRequires: ocaml >= 3.04-7 +BuildRequires: ocaml >= 3.11.0 BuildRequires: ocaml-findlib %endif BuildRequires: nss-devel >= 3.12.8 @@ -165,28 +147,31 @@ BuildRequires: openssl-devel BuildRequires: pciutils-devel BuildRequires: perl-base BuildRequires: perl-tools-pod -BuildRequires: pixman-devel BuildRequires: pkgconfig BuildRequires: python-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.647 +BuildRequires: seabios BuildRequires: texi2html BuildRequires: texlive-dvips BuildRequires: texlive-latex-psnfss BuildRequires: texlive-xetex BuildRequires: transfig -BuildRequires: usbredir-devel >= 0.5.3 -BuildRequires: vde2-devel BuildRequires: which # for xfsctl () BuildRequires: xfsprogs-devel +BuildRequires: xz-devel +BuildRequires: yajl-devel +BuildRequires: zlib-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: vde2-devel BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXext-devel %endif -BuildRequires: xz-devel -BuildRequires: yajl-devel -BuildRequires: zlib-devel %if %{with qemu_traditional} # FIXME: see qemu configure comments on top of spec %{!?with_opengl:BuildConflicts: OpenGL-devel} @@ -215,6 +200,7 @@ Requires: which Requires: %{name}-guest = %{version}-%{release} Obsoletes: xen-doc Obsoletes: xen-udev +Obsoletes: xen-xend ExclusiveArch: %{ix86} %{x8664} arm %ifarch %{ix86} %{x8664} # for HVM @@ -223,7 +209,7 @@ Suggests: qemu-system-x86 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) # some PPC/SPARC boot images in ELF format -%define _noautostrip .*%{_datadir}/\\(xen\\|qemu-xen\\)/qemu/\\(openbios-.*\\|palcode-clipper\\|s390-ccw.img\\) +%define _noautostrip .*%{_datadir}/\\(xen\\|qemu-xen\\)/qemu/\\(openbios-.*\\|palcode-clipper\\|s390-ccw.img\\) %description This package contains the Xen hypervisor and Xen tools, needed to run @@ -310,19 +296,6 @@ Static Xen libraries. %description static -l pl.UTF-8 Statyczne biblioteki Xena. -%package xend -Summary: xend daemon -Summary(pl.UTF-8): Demon xend -Group: Daemons -Requires(post,preun,postun): systemd-units >= 38 -Requires: systemd-units >= 38 - -%description xend -xend daemon. - -%description xend -l pl.UTF-8 -Demon xend. - %package -n ocaml-xen Summary: OCaml bindings for Xen Summary(pl.UTF-8): Wiązania OCamla dla Xena @@ -382,11 +355,11 @@ Xen Python modules for both dom0 and domU virtual machines. Moduły Pythona dla maszyn wirtualnych dom0 i domU. %package -n bash-completion-%{name} -Summary: bash-completion for Xen (xl) +Summary: bash-completion for Xen (xl) Summary(pl.UTF-8): Bashowe dopełnianie poleceń dla Xena (xl) -Group: Applications/Shells -Requires: %{name} = %{version}-%{release} -Requires: bash-completion +Group: Applications/Shells +Requires: %{name} = %{version}-%{release} +Requires: bash-completion %description -n bash-completion-%{name} This package provides bash-completion for Xen (xl). @@ -409,22 +382,29 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware (U)EFI, bez potrzeby oddzielnego bootloadera. %prep -%setup -q -a 16 +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %patch7 -p1 -%patch8 -p1 +%patch9 -p1 %patch10 -p1 -%patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch18 -p1 +%patch19 -p1 +%patch22 -p1 +%patch23 -p1 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch29 -p1 # stubdom sources ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom @@ -454,23 +434,22 @@ export PATH=$(pwd)/our-ld:$PATH export CFLAGS="%{rpmcflags} -I/usr/include/ncurses" export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses" -# NOTE: -# - there is a quoting bug (in tools/driver/Makefile) that causes -# openssl is used instead of gcrypt; that's OK, openssl is obligatory -# anyway (see configure), gcrypt is optional +# NOTE on ac_cv_*: +# - use openssl (libcrypto) instead of libgcrypt as openssl is obligatory anyway # - prevent libiconv from being detected (not needed with glibc) %configure \ CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \ + ac_cv_lib_gcrypt_gcry_md_hash_buffer=no \ ac_cv_lib_iconv_libiconv_open=no \ + --disable-debug \ %{__enable_disable qemu_traditional qemu-traditional} \ - %{__enable_disable blktap1 blktap1} \ - %{__enable_disable xend xend} \ + --with-system-seabios=/usr/share/seabios/bios.bin \ %ifarch %{x8664} --with-system-qemu=/usr/bin/qemu-system-x86_64 \ %else --with-system-qemu=/usr/bin/qemu-system-i386 \ %endif - --disable-debug + --with-systemd=%{systemdunitdir} %{__make} -j1 dist-xen dist-tools dist-docs \ %{!?with_ocaml:OCAML_TOOLS=n} \ @@ -506,46 +485,24 @@ install -d $RPM_BUILD_ROOT/etc/efi-boot/update.d DESTDIR=$RPM_BUILD_ROOT \ HOTPLUGS=install-udev -%if %{with qemu_traditional} -%if "%{_lib}" == "lib64" -ln -s %{_prefix}/lib/%{name}/bin/qemu-dm $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/qemu-dm -%endif -%endif - -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 install %{SOURCE37} $RPM_BUILD_ROOT/etc/sysconfig/xenstored -install %{SOURCE38} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xenstored.conf -%if %{with xend} -install %{SOURCE39} $RPM_BUILD_ROOT%{systemdunitdir}/xend.service -install %{SOURCE40} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xend.conf -%endif -install %{SOURCE41} $RPM_BUILD_ROOT%{systemdunitdir}/xen-watchdog.service -install %{SOURCE42} $RPM_BUILD_ROOT/etc/modules-load.d/xen-dom0.conf -install %{SOURCE43} $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/bin/xendomains.sh -install %{SOURCE44} $RPM_BUILD_ROOT%{systemdunitdir}/xendomains.service + # sysvinit scripts %{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/* %{__rm} $RPM_BUILD_ROOT/etc/sysconfig/xencommons -%if %{with xend} -install %{SOURCE50} $RPM_BUILD_ROOT/etc/rc.d/init.d/xend -%endif install %{SOURCE51} $RPM_BUILD_ROOT/etc/rc.d/init.d/xenconsoled install %{SOURCE52} $RPM_BUILD_ROOT/etc/rc.d/init.d/xenstored install %{SOURCE53} $RPM_BUILD_ROOT/etc/rc.d/init.d/xen-watchdog install %{SOURCE54} $RPM_BUILD_ROOT/etc/rc.d/init.d/xendomains +install %{SOURCE46} $RPM_BUILD_ROOT/etc/rc.d/init.d/xen-qemu-dom0-disk-backend install %{SOURCE55} $RPM_BUILD_ROOT/etc/logrotate.d/xen install %{SOURCE56} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xen.conf +install -d $RPM_BUILD_ROOT/var/run/xenstored +install %{SOURCE38} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/xenstored.conf -install %{SOURCE60} $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/bin/xen-init-list -install %{SOURCE61} $RPM_BUILD_ROOT%{_prefix}/lib/%{name}/bin/xen-toolstack +install %{SOURCE60} $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/xen-init-list +install %{SOURCE61} $RPM_BUILD_ROOT%{_libdir}/%{name}/bin/xen-toolstack %if %{with efi} install %{SOURCE57} $RPM_BUILD_ROOT/etc/efi-boot/xen.cfg @@ -553,13 +510,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 @@ -570,16 +527,13 @@ done # remove unneeded files %if %{with hypervisor} -%{__rm} $RPM_BUILD_ROOT/boot/xen-4.4.gz +%{__mv} xen/xen-syms $RPM_BUILD_ROOT/boot/%{name}-syms-%{version} +%{__rm} $RPM_BUILD_ROOT/boot/xen-4.6.gz %{__rm} $RPM_BUILD_ROOT/boot/xen-4.gz %endif %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/xen %{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING -%if %{without xend} -%{__rm} -r $RPM_BUILD_ROOT/var/run/xend -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -588,8 +542,9 @@ rm -rf $RPM_BUILD_ROOT /sbin/chkconfig --add xenconsoled /sbin/chkconfig --add xenstored /sbin/chkconfig --add xendomains +/sbin/chkconfig --add xen-qemu-dom0-disk-backend NORESTART=1 -%systemd_post xen-watchdog.service xenconsoled.service xenstored.service xendomains.service +%systemd_post xen-watchdog.service xenconsoled.service xenstored.service xendomains.service xen-qemu-dom0-disk-backend.service %preun if [ "$1" = "0" ]; then @@ -604,24 +559,13 @@ if [ "$1" = "0" ]; then %service xen-watchdog stop /sbin/chkconfig --del xen-watchdog -fi -%systemd_preun xen-watchdog.service xenconsoled.service xenstored.service xendomains.service - -%postun -%systemd_reload - -%post xend -/sbin/chkconfig --add xend -%systemd_post xend.service -%preun xend -if [ "$1" = "0" ]; then - %service xend stop - /sbin/chkconfig --del xend + %service xen-qemu-dom0-disk-backend stop + /sbin/chkconfig --del xen-qemu-dom0-disk-backend fi -%systemd_preun xend.service +%systemd_preun xen-watchdog.service xenconsoled.service xenstored.service xendomains.service xen-qemu-dom0-disk-backend.service -%postun xend +%postun %systemd_reload %post libs -p /sbin/ldconfig @@ -642,7 +586,7 @@ fi /boot/%{name}.gz %endif %if %{with xsm} -/boot/xenpolicy.24 +/boot/xenpolicy-%{version} %endif %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xenconsoled %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xenstored @@ -652,13 +596,18 @@ fi %attr(754,root,root) /etc/rc.d/init.d/xenconsoled %attr(754,root,root) /etc/rc.d/init.d/xenstored %attr(754,root,root) /etc/rc.d/init.d/xendomains -%config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/xen-dom0.conf +%attr(754,root,root) /etc/rc.d/init.d/xen-qemu-dom0-disk-backend +%{_prefix}/lib/modules-load.d/xen.conf %{systemdunitdir}/proc-xen.mount %{systemdunitdir}/var-lib-xenstored.mount +%{systemdunitdir}/xen-init-dom0.service %{systemdunitdir}/xen-watchdog.service %{systemdunitdir}/xenconsoled.service %{systemdunitdir}/xenstored.service +%{systemdunitdir}/xenstored.socket +%{systemdunitdir}/xenstored_ro.socket %{systemdunitdir}/xendomains.service +%{systemdunitdir}/xen-qemu-dom0-disk-backend.service %dir %{_sysconfdir}/xen %dir %{_sysconfdir}/xen/auto %dir %{_sysconfdir}/xen/examples @@ -668,19 +617,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}/remus +%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 @@ -706,53 +651,42 @@ 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} %dir %{_libdir}/%{name}/bin %attr(744,root,root) %{_libdir}/%{name}/bin/* -%if "%{_lib}" != "lib" -%dir %{_prefix}/lib/%{name} -%dir %{_prefix}/lib/%{name}/bin -%attr(755,root,root) %{_prefix}/lib/%{name}/bin/* -%endif -%dir %{_prefix}/lib/%{name}/boot +%dir %{_libdir}/%{name}/boot %if %{with stubdom} %if %{with qemu_traditional} -%{_prefix}/lib/%{name}/boot/ioemu-stubdom.gz +%{_libdir}/%{name}/boot/ioemu-stubdom.gz %endif %ifarch %{ix86} %{x8664} -%{_prefix}/lib/%{name}/boot/pv-grub-x86_32.gz +%{_libdir}/%{name}/boot/pv-grub-x86_32.gz %endif %ifarch %{x8664} -%{_prefix}/lib/%{name}/boot/pv-grub-x86_64.gz +%{_libdir}/%{name}/boot/pv-grub-x86_64.gz %endif -%{_prefix}/lib/%{name}/boot/vtpm-stubdom.gz -%{_prefix}/lib/%{name}/boot/vtpmmgr-stubdom.gz -%{_prefix}/lib/%{name}/boot/xenstore-stubdom.gz +%{_libdir}/%{name}/boot/vtpm-stubdom.gz +%{_libdir}/%{name}/boot/vtpmmgr-stubdom.gz +%{_libdir}/%{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* +%attr(744,root,root) %{_libdir}/%{name}/boot/hvmloader %{_mandir}/man1/xentop.1* %{_mandir}/man1/xentrace_format.1* %{_mandir}/man1/xl.1* -%if %{with xend} -%{_mandir}/man1/xm.1* -%{_mandir}/man5/xend-config.sxp.5* -%endif %{_mandir}/man5/xl.cfg.5* %{_mandir}/man5/xl.conf.5* %{_mandir}/man5/xlcpupool.cfg.5* -%{_mandir}/man5/xmdomain.cfg.5* %{_mandir}/man8/xentrace.8* %{_sharedstatedir}/xen %{_sharedstatedir}/xenstored %dir /var/run/xenstored -%{systemdtmpfilesdir}/xenstored.conf %{systemdtmpfilesdir}/xen.conf +%{systemdtmpfilesdir}/xenstored.conf %dir %attr(0700,root,root) /var/log/xen %dir %attr(0700,root,root) /var/log/xen/console %if %{with qemu_traditional} @@ -762,12 +696,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) -%attr(755,root,root) %{_libdir}/libblktap.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libblktap.so.3.0 %attr(755,root,root) %{_libdir}/libblktapctl.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libblktapctl.so.1.0 %attr(755,root,root) %{_libdir}/libfsimage.so.*.*.* @@ -775,17 +719,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.4 +%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.4 +%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.4 +%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 @@ -803,7 +747,6 @@ fi %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libblktap.so %attr(755,root,root) %{_libdir}/libblktapctl.so %attr(755,root,root) %{_libdir}/libfsimage.so %attr(755,root,root) %{_libdir}/libvhd.so @@ -817,7 +760,6 @@ fi %{_includedir}/_libxl_list.h %{_includedir}/_libxl_types.h %{_includedir}/_libxl_types_json.h -%{_includedir}/blktaplib.h %{_includedir}/fsimage*.h %{_includedir}/libxenvchan.h %{_includedir}/libxl*.h @@ -825,10 +767,11 @@ fi %{_includedir}/xs*.h %{_includedir}/xen %{_includedir}/xenstore-compat +%{_npkgconfigdir}/xenlight.pc +%{_npkgconfigdir}/xlutil.pc %files static %defattr(644,root,root,755) -%{_libdir}/libblktap.a %{_libdir}/libblktapctl.a %{_libdir}/libvhd.a %{_libdir}/libxenctrl.a @@ -839,24 +782,6 @@ fi %{_libdir}/libxenstore.a %{_libdir}/libxlutil.a -%if %{with xend} -%files xend -%defattr(644,root,root,755) -%if %{with blktap1} -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/blktapctrl -%{systemdunitdir}/blktapctrl.service -%endif -%{systemdunitdir}/xend.service -%attr(754,root,root) %{_sysconfdir}/rc.d/init.d/xend -%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/xend.rules -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xm* -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xen/xend* -%attr(755,root,root) %{_sbindir}/xend -%attr(755,root,root) %{_sbindir}/xm -%dir %attr(700,root,root) /var/run/xend -%{systemdtmpfilesdir}/xend.conf -%endif - %if %{with ocaml} %files -n ocaml-xen %defattr(644,root,root,755) @@ -911,19 +836,11 @@ fi %files -n python-xen %defattr(644,root,root,755) %attr(755,root,root) %{py_sitedir}/fsimage.so -%{py_sitedir}/grub -%attr(755,root,root) %{py_sitedir}/xen/lowlevel/checkpoint.so -%attr(755,root,root) %{py_sitedir}/xen/lowlevel/flask.so -%attr(755,root,root) %{py_sitedir}/xen/lowlevel/netlink.so -%attr(755,root,root) %{py_sitedir}/xen/lowlevel/ptsname.so +%dir %{py_sitedir}/xen +%dir %{py_sitedir}/xen/lowlevel %attr(755,root,root) %{py_sitedir}/xen/lowlevel/xc.so -%if %{with xend} -%{py_sitedir}/xen/remus -%{py_sitedir}/xen/util -%{py_sitedir}/xen/web -%{py_sitedir}/xen/xend -%{py_sitedir}/xen/xm -%endif +%{py_sitedir}/xen/migration +%{py_sitedir}/grub %if "%{py_ver}" > "2.4" %{py_sitedir}/pygrub-0.3-py*.egg-info %{py_sitedir}/xen-3.0-py*.egg-info