--- xen.spec.orig 2014-07-16 23:22:08.151369145 -0700 +++ xen.spec 2014-07-16 23:22:46.366369145 -0700 @@ -29,21 +29,21 @@ %ifnarch x86_64 %define build_efi 0 %endif -%if "%dist" >= ".fc17" +#%if "%dist" >= ".fc17" %define with_sysv 0 -%else -%define with_sysv 1 -%endif -%if "%dist" >= ".fc15" +#%else +#%define with_sysv 1 +#%endif +#%if "%dist" >= ".fc15" %define with_systemd 1 -%else -%define with_systemd 0 -%endif -%if "%dist" >= ".fc20" +#%else +#%define with_systemd 0 +#%endif +#%if "%dist" >= ".fc20" %define with_systemd_presets 1 -%else -%define with_systemd_presets 0 -%endif +#%else +#%define with_systemd_presets 0 +#%endif # don't build xend unless rpmbuild was run with --with xend %define build_xend %{?_with_xend: 1} %{?!_with_xend: 0} @@ -137,7 +137,7 @@ # iasl needed to build hvmloader BuildRequires: iasl # build using Fedora seabios and ipxe packages for roms -BuildRequires: seabios-bin ipxe-roms-qemu +#BuildRequires: seabios-bin ipxe-roms-qemu # modern compressed kernels BuildRequires: bzip2-devel xz-devel # libfsimage @@ -311,7 +311,7 @@ %endif %if %build_efi %define efi_flags LD_EFI=/usr/x86_64-w64-mingw32/bin/ld -mkdir -p dist/install/boot/efi/efi/fedora +mkdir -p dist/install/boot/efi/efi/centos %endif %if %build_xend %define xend_opt --enable-xend @@ -319,7 +319,8 @@ export XEN_VENDORVERSION="-%{release}" export CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} %{?efi_flags} prefix=/usr dist-xen -./configure --libdir=%{_libdir} --with-system-seabios=/usr/share/seabios/bios.bin --with-system-qemu=/usr/bin/qemu-system-i386 %{?xend_opt} +#./configure --libdir=%{_libdir} --with-system-seabios=/usr/share/seabios/bios.bin --with-system-qemu=/usr/bin/qemu-system-i386 %{?xend_opt} +./configure --prefix=/usr --libdir=%{_libdir} make %{?_smp_mflags} %{?ocaml_flags} prefix=/usr dist-tools make prefix=/usr dist-docs unset CFLAGS @@ -332,7 +333,7 @@ mkdir -p %{buildroot}%{_libdir}/ocaml/stublibs %endif %if %build_efi -mkdir -p %{buildroot}/boot/efi/efi/fedora +mkdir -p %{buildroot}/boot/efi/efi/centos %endif make DESTDIR=%{buildroot} %{?efi_flags} prefix=/usr install-xen make DESTDIR=%{buildroot} %{?ocaml_flags} prefix=/usr install-tools @@ -373,16 +374,16 @@ rm -f %{buildroot}%{_sbindir}/xen-python-path # qemu stuff (unused or available from upstream) -rm -rf %{buildroot}/usr/share/xen/man -rm -rf %{buildroot}/usr/bin/qemu-*-xen -ln -s qemu-img %{buildroot}/%{_bindir}/qemu-img-xen -ln -s qemu-img %{buildroot}/%{_bindir}/qemu-nbd-xen -for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ - pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ - vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb -do - rm -f %{buildroot}/%{_datadir}/xen/qemu/$file -done +#rm -rf %{buildroot}/usr/share/xen/man +#rm -rf %{buildroot}/usr/bin/qemu-*-xen +#ln -s qemu-img %{buildroot}/%{_bindir}/qemu-img-xen +#ln -s qemu-img %{buildroot}/%{_bindir}/qemu-nbd-xen +#for file in bios.bin openbios-sparc32 openbios-sparc64 ppc_rom.bin \ +# pxe-e1000.bin pxe-ne2k_pci.bin pxe-pcnet.bin pxe-rtl8139.bin \ +# vgabios.bin vgabios-cirrus.bin video.x openbios-ppc bamboo.dtb +#do +# rm -f %{buildroot}/%{_datadir}/xen/qemu/$file +#done # README's not intended for end users rm -f %{buildroot}/%{_sysconfdir}/xen/README* @@ -437,6 +438,7 @@ install -m 644 %{SOURCE31} %{buildroot}%{_sysconfdir}/sysconfig/xenconsoled # systemd +mkdir -p %{buildroot}%{_unitdir} %if %with_systemd mkdir -p %{buildroot}%{_unitdir} install -m 644 %{SOURCE40} %{buildroot}%{_unitdir}/proc-xen.mount @@ -454,6 +456,7 @@ install -m 644 %{SOURCE49} %{buildroot}/usr/lib/tmpfiles.d/xen.conf %endif %if %build_ocaml +mkdir -p %{buildroot}/usr/lib/systemd/system/ install -m 644 %{SOURCE50} %{buildroot}%{_unitdir}/oxenstored.service %endif @@ -649,6 +652,15 @@ %if %build_xend %{_datadir}/%{name}/create.dtd %endif +%{_datadir}/qemu-xen/* +#%{_datadir}/doc/xen/* +%{_datadir}/xen/qemu/* +#%{_prefix}/lib64/efi/* +%{_prefix}/lib/xen/bin/* +#%{_sysconfdir}/xen/README +#%{_sysconfdir}/xen/README.incompatibilities +%{_prefix}/etc/qemu/target-x86_64.conf +%{_prefix}/libexec/qemu-bridge-helper # Startup script %if %with_sysv @@ -851,7 +863,7 @@ /boot/flask/xenpolicy.* %endif %if %build_efi -/boot/efi/EFI/fedora/*.efi +/boot/efi/EFI/centos/*.efi %endif %endif