--- xen4c.spec.orig 2020-06-18 10:34:48.294722278 -0700 +++ build/SPECS/xen4c.spec 2020-06-18 10:33:37.707722278 -0700 @@ -188,12 +188,6 @@ # xsm policy file needs needs checkpolicy and m4 BuildRequires: checkpolicy m4 %endif -%if %{defined _with_tumeq} -BuildRequires: SDL-devel -%endif -# qemu-xen BR -# now done via macro qemu-config.br -%include %{SOURCE32} #Requires: bridge-utils Requires: python3-lxml @@ -316,6 +310,7 @@ This package contains libraries for developing ocaml tools to manage Xen virtual machines. +%if ! %{defined _with_noqemu} %package -n qemuu Version: 3.0.1+3 Release: 2%{?dist} @@ -328,6 +323,9 @@ Conflicts: qemu-img = 15:2.12.0 Conflicts: qemu-kvm-core = 0:4.5.0 #Provides: qemu-img, qemu-nbd, qemu-system-i386 +# qemu-xen BuildRequires via macro +# now done via macro qemu-config.br +%include %{SOURCE32} #Requires: /usr/bin/qemu-img /usr/bin/qemu-nbd # Ensure we at least have a suitable kernel installed, though we can't # force user to actually boot it. @@ -338,6 +336,7 @@ %description -n qemuu This package contains the runtime programs which form the qemuu part of the core Xen userspace environment. +%endif %if %{defined _with_tumeq} %package -n qemut @@ -348,6 +347,8 @@ Group: Development/Libraries Provides: qemut #,qemu-dm,qemu-img-xen,qemu-nbd-xen +BuildRequires: SDL-devel + Requires: xen-libs = %{epoch}:%{tarversion}-%{release} #Requires: /usr/bin/qemu-img /usr/bin/qemu-nbd # Ensure we at least have a suitable kernel installed, though we can't @@ -460,7 +461,7 @@ #sed -i -e '/^# CONFIG_DEBUG is not/d' ${tdir}/xen/.config # start debug build -export XEN_EXTRAVERSION=.2-perf +export XEN_EXTRAVERSION=.3-perf %{__make} -j2 -C ${tdir}/xen cp -p ${tdir}/xen/.config dist/install/boot/kcfg/xen-%{hv_abi}-perf.config cp ${tdir}/xen/xen.gz dist/install/boot/xen-%{hv_abi}-perf.gz @@ -522,6 +523,7 @@ PYTHON=/usr/bin/python3 %{__make} -j2 dist-tools PYTHON=/usr/bin/python3 %{__make} -j2 dist-docs +%if ! %{defined _with_noqemu} # system-qemu patch was set in config, so build qemu-xen, staged to dist/uumeq sed -i -e '/^CONFIG_QEMU_XEN/ s|= n$|= y|' config/Tools.mk ; @@ -538,6 +540,7 @@ ln -sf ../lib/xen/bin/qemu-img $PWD/dist/uumeq/usr/bin/qemu-img cp -p %{SOURCE27} $PWD/dist/uumeq/usr/bin/ fi +%endif %if %{defined _with_tumeq} export QUT=${PWD}/dist/tumeq @@ -596,6 +599,7 @@ fi fi +%if ! %{defined _with_noqemu} (cd dist/uumeq;find . -type f -or -type l | sed -e s/^.// -e /^$/d) | sort > uumeq.lst sed -i -e '/man\/man/ s|$|.gz|' uumeq.lst @@ -603,6 +607,7 @@ # need only one line for the bios dir sed -i -e '/usr\/share\/qemu-xen/d' uumeq.lst sed -i -e '/doc\/qemu/d' uumeq.lst +%endif %if %{defined _with_tumeq} (cd dist/tumeq;find . -type f -or -type l | sed -e s/^.// -e /^$/d) | sort > tumeq.lst @@ -885,6 +890,7 @@ #{_datadir}/xen/qemu/* %endif +%if ! %{defined _with_noqemu} %files -n qemuu -f uumeq.lst %defattr(-,root,root) #license COPYING @@ -893,7 +899,7 @@ %{_datadir}/qemu-xen/qemu/* %doc %{_xenlib}/%{name}/share/doc/qemu/* %dir %{_xenlib}/%{name}/lib/ - +%endif # All runtime stuff except for XenD/xm python stuff %files runtime -f runtime.lst