- Restore 32bit ix86 support in spec file for kmps and domU tools

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=288

xen.spec

@@ -17,7 +17,7 @@
 
 
 Name:           xen
-ExclusiveArch:  x86_64 %arm aarch64
+ExclusiveArch:  %ix86 x86_64 %arm aarch64
 %define xvers 4.4
 %define xvermaj 4
 %define changeset 28233
@@ -27,12 +27,21 @@ ExclusiveArch:  x86_64 %arm aarch64
 %define with_debug 0
 %define with_stubdom 0
 %define with_xend 0
+%define with_dom0_support 1
 %else
 %define with_kmp 1
 %define with_debug 1
 %define with_stubdom 1
 %define with_qemu_traditional 1
 %define with_xend 0
+%ifarch x86_64
+%define with_dom0_support 1
+%else
+%define with_dom0_support 0
+%define with_stubdom 0
+%define with_qemu_traditional 0
+%define with_xend 0
+%endif
 %endif
 # EFI requires gcc46 or newer
 # its available in 12.1 or >= sles11sp2
@@ -234,34 +243,37 @@ Patch403:       xen.migrate.tools_set_number_of_dirty_pages_during_migration.pat
 Patch404:       xend-config.patch
 Patch405:       xend-max-free-mem.patch
 Patch406:       xend-hvm-default-pae.patch
-Patch407:       xend-xenapi-console-protocol.patch
-Patch408:       xend-core-dump-loc.patch
-Patch409:       xend-xen-api-auth.patch
-Patch410:       xend-checkpoint-rename.patch
-Patch411:       xend-xm-save-check-file.patch
-Patch412:       xend-xm-create-xflag.patch
-Patch413:       xend-domu-usb-controller.patch
-Patch414:       xend-devid-or-name.patch
-Patch415:       xend-migration-domname-fix.patch
-Patch416:       xend-del_usb_xend_entry.patch
-Patch417:       xend-xen-domUloader.patch
-Patch418:       xend-multi-xvdp.patch
-Patch419:       xend-check_device_status.patch
-Patch420:       xend-change_home_server.patch
-Patch421:       xend-minimum-restart-time.patch
-Patch422:       xend-disable-internal-logrotate.patch
-Patch423:       xend-console-port-restore.patch
-Patch424:       xend-vcpu-affinity-fix.patch
-Patch425:       xend-migration-bridge-check.patch
-Patch426:       xend-managed-pci-device.patch
-Patch427:       xend-hvm-firmware-passthrough.patch
-Patch428:       xend-cpuinfo-model-name.patch
-Patch429:       xend-xm-reboot-fix.patch
-Patch430:       xend-domain-lock.patch
-Patch431:       xend-domain-lock-sfex.patch
-Patch432:       xend-32on64-extra-mem.patch
-Patch433:       xend-hv_extid_compatibility.patch
-Patch434:       xend-xenpaging.autostart.patch
+Patch407:       xend-vif-route-ifup.patch
+Patch408:       xend-xenapi-console-protocol.patch
+Patch409:       xend-core-dump-loc.patch
+Patch410:       xend-xen-api-auth.patch
+Patch411:       xend-checkpoint-rename.patch
+Patch412:       xend-xm-save-check-file.patch
+Patch413:       xend-xm-create-xflag.patch
+Patch414:       xend-domu-usb-controller.patch
+Patch415:       xend-devid-or-name.patch
+Patch416:       xend-migration-domname-fix.patch
+Patch417:       xend-del_usb_xend_entry.patch
+Patch418:       xend-xen-domUloader.patch
+Patch419:       xend-multi-xvdp.patch
+Patch420:       xend-check_device_status.patch
+Patch421:       xend-change_home_server.patch
+Patch422:       xend-minimum-restart-time.patch
+Patch423:       xend-disable-internal-logrotate.patch
+Patch424:       xend-config-enable-dump-comment.patch
+Patch425:       xend-tools-watchdog-support.patch
+Patch426:       xend-console-port-restore.patch
+Patch427:       xend-vcpu-affinity-fix.patch
+Patch428:       xend-migration-bridge-check.patch
+Patch429:       xend-managed-pci-device.patch
+Patch430:       xend-hvm-firmware-passthrough.patch
+Patch431:       xend-cpuinfo-model-name.patch
+Patch432:       xend-xm-reboot-fix.patch
+Patch433:       xend-domain-lock.patch
+Patch434:       xend-domain-lock-sfex.patch
+Patch435:       xend-32on64-extra-mem.patch
+Patch436:       xend-hv_extid_compatibility.patch
+Patch437:       xend-xenpaging.autostart.patch
 # Other bug fixes or features
 Patch450:       libxen_permissive.patch
 Patch451:       xenconsole-no-multiple-connections.patch
@@ -342,6 +354,8 @@ Authors:
     Ewan Mellor <ewan@xensource.com>
     ...
 
+%if %{?with_dom0_support}0
+
 %package libs
 Summary:        Xen Virtualization: Libraries
 Group:          System/Kernel
@@ -422,6 +436,7 @@ migrate, and manage virtual machines using the legacy xend/xm toolstack.
 In addition to this package you need to install kernel-xen, xen and
 xen-libs to use Xen.
 %endif
+%endif
 
 %package tools-domU
 Summary:        Xen Virtualization: Control tools for domain U
@@ -479,6 +494,8 @@ virtualized guests.
 
 %endif
 
+%if %{?with_dom0_support}0
+
 %package doc-html
 Summary:        Xen Virtualization: HTML documentation
 Group:          Documentation/HTML
@@ -496,7 +513,7 @@ your browser at file:/usr/share/doc/packages/xen/html/
 Authors:
 --------
     Ian Pratt <ian.pratt@cl.cam.ac.uk>
-
+%endif
 
 %prep
 %setup -q -n %xen_build_dir -a 1 -a 2 -a 3 -a 4 -a 5 -a 57 -a 20000
@@ -598,6 +615,9 @@ Authors:
 %patch432 -p1
 %patch433 -p1
 %patch434 -p1
+%patch435 -p1
+%patch436 -p1
+%patch437 -p1
 %endif
 # Other bug fixes or features
 %patch450 -p1
@@ -661,6 +681,7 @@ configure_flags="${configure_flags} --disable-xend"
         --libdir=%{_libdir} \
         --datadir=%{_datadir} \
         --enable-blktap1 ${configure_flags}
+%if %{?with_dom0_support}0
 CFLAGS_SAVE=$CFLAGS
 %ifnarch %arm aarch64
 make -C xenalyze.hg CC="gcc -I../xen/include -DMAX_CPUS=%{max_cpus} ${RPM_OPT_FLAGS}" %{?_smp_mflags} -k
@@ -671,6 +692,10 @@ make -C tools/debugger/gdbsx
 %if %{?with_xend}0
 make -C tools/xen-utils-0.1 XEN_INTREE_BUILD=yes XEN_ROOT=$PWD
 %endif
+%else
+make -C tools/include/xen-foreign %{?_smp_mflags}
+make tools docs %{?_smp_mflags}
+%endif
 %if %{?with_kmp}0
 # PV driver modules
 export XL=/usr/src/linux
@@ -760,6 +785,7 @@ done
 %endif
 
 # Stubdom
+%if %{?with_dom0_support}0
 %if %{?with_stubdom}0
 # remove -fstack-protector flag for stubdom build section
 export EXTRA_CFLAGS_XEN_TOOLS=$(echo $RPM_OPT_FLAGS |sed -e 's/-fstack-protector//g')
@@ -932,6 +958,34 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/xen-list.1.gz
 # Create symlinks for keymaps
 %fdupes -s $RPM_BUILD_ROOT/%{_datadir}
 
+%else
+# !with_dom0_support
+
+# 32 bit hypervisor no longer supported.  Remove dom0 tools.
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/man
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/fs
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/xen
+rm -rf $RPM_BUILD_ROOT/%{_libdir}/python*
+rm -rf $RPM_BUILD_ROOT/usr/sbin
+rm -rf $RPM_BUILD_ROOT/etc/xen
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/qemu-xen
+rm -rf $RPM_BUILD_ROOT/var
+rm -f  $RPM_BUILD_ROOT/%{_sysconfdir}/bash_completion.d/xl.sh
+rm -f  $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/xen*
+rm -f  $RPM_BUILD_ROOT/%{_sysconfdir}/init.d/xen*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/*store*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/*trace*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/xenco*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/pygrub
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/remus
+rm -f  $RPM_BUILD_ROOT/usr/etc/qemu/target-x86_64.conf
+rm -f  $RPM_BUILD_ROOT/usr/libexec/qemu-bridge-helper
+rm -f  $RPM_BUILD_ROOT/%{_libdir}/*.so.*
+%endif
+
+%if %{?with_dom0_support}0
+
 %files -f xen.files.txt
 %defattr(-,root,root)
 /boot/xen-%{version}-%{release}.gz
@@ -1167,7 +1221,6 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/xen-list.1.gz
 /etc/xen/scripts/vm-monitor
 /etc/xen/scripts/set-lock
 %{_libdir}/python%{pyver}/site-packages/xen/remus/*
-#%{_libdir}/python%{pyver}/site-packages/xen/sv/*
 %{_libdir}/python%{pyver}/site-packages/xen/util/*
 %{_libdir}/python%{pyver}/site-packages/xen/xend/*
 %{_libdir}/python%{pyver}/site-packages/xen/xm/*
@@ -1179,6 +1232,8 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/xen-list.1.gz
 %{_mandir}/man1/xen-list.1.gz
 %endif
 %endif
+# with_dom0_support
+%endif
 
 %files tools-domU
 %defattr(-,root,root)
@@ -1194,6 +1249,8 @@ rm -f $RPM_BUILD_ROOT/usr/share/man/man1/xen-list.1.gz
 %{_libdir}/*.so
 /usr/include/*
 
+%if %{?with_dom0_support}0
+
 %files doc-html
 %defattr(-,root,root)
 %{_defaultdocdir}/xen/html
@@ -1288,4 +1345,7 @@ fi
 
 %postun libs -p /sbin/ldconfig
 
+# with_dom0_support
+%endif
+
 %changelog