#2 Use make macros
Merged 3 years ago by myoung. Opened 3 years ago by tstellar.
rpms/ tstellar/xen make-macros  into  master

file modified
+10 -6
@@ -58,7 +58,7 @@ 

  Summary: Xen is a virtual machine monitor

  Name:    xen

  Version: 4.13.1

- Release: 4%{?dist}

+ Release: 5%{?dist}

  License: GPLv2+ and LGPLv2+ and BSD

  URL:     http://xen.org/

  Source0: https://downloads.xenproject.org/release/xen/%{version}/xen-%{version}.tar.gz
@@ -399,15 +399,15 @@ 

  export PYTHON="/usr/bin/python3"

  %if %build_hyp

  %if %build_crosshyp

- XEN_TARGET_ARCH=x86_64 make %{?_smp_mflags} prefix=/usr xen CC="/usr/bin/x86_64-linux-gnu-gcc `echo $RPM_OPT_FLAGS | sed -e 's/-m32//g' -e 's/-march=i686//g' -e 's/-mtune=atom//g' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g' -e 's/-fstack-clash-protection//g' -e 's/-mcet//g' -e 's/-fcf-protection//g'`"

+ XEN_TARGET_ARCH=x86_64 %make_build prefix=/usr xen CC="/usr/bin/x86_64-linux-gnu-gcc `echo $RPM_OPT_FLAGS | sed -e 's/-m32//g' -e 's/-march=i686//g' -e 's/-mtune=atom//g' -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g' -e 's/-fstack-clash-protection//g' -e 's/-mcet//g' -e 's/-fcf-protection//g'`"

  %else

  %ifarch armv7hl

- make %{?_smp_mflags} prefix=/usr xen CC="gcc `echo $RPM_OPT_FLAGS | sed -e 's/-mfloat-abi=hard//g' -e 's/-march=armv7-a//g'`"

+ %make_build prefix=/usr xen CC="gcc `echo $RPM_OPT_FLAGS | sed -e 's/-mfloat-abi=hard//g' -e 's/-march=armv7-a//g'`"

  %else

  %ifarch aarch64

- make %{?_smp_mflags} prefix=/usr xen CC="gcc $RPM_OPT_FLAGS -mno-outline-atomics"

+ %make_build prefix=/usr xen CC="gcc $RPM_OPT_FLAGS -mno-outline-atomics"

  %else

- make %{?_smp_mflags} prefix=/usr xen CC="gcc `echo $RPM_OPT_FLAGS | sed -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g' -e 's/-fcf-protection//g'`"

+ %make_build prefix=/usr xen CC="gcc `echo $RPM_OPT_FLAGS | sed -e 's/-specs=\/usr\/lib\/rpm\/redhat\/redhat-annobin-cc1//g' -e 's/-fcf-protection//g'`"

  %endif

  %endif

  %endif
@@ -424,7 +424,7 @@ 

  CONFIG_EXTRA="$CONFIG_EXTRA --with-system-ipxe=/usr/share/ipxe/10ec8139.rom"

  %endif

  ./configure --prefix=%{_prefix} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --with-system-seabios=%{seabiosloc} --with-system-qemu=/usr/bin/qemu-system-i386 --with-linux-backend-modules="xen-evtchn xen-gntdev xen-gntalloc xen-blkback xen-netback xen-pciback xen-scsiback xen-acpi-processor" $CONFIG_EXTRA

- make %{?_smp_mflags} %{?ocaml_flags} prefix=/usr tools

+ %make_build %{?ocaml_flags} prefix=/usr tools

  %if %build_docs

  make                 prefix=/usr docs

  %endif
@@ -940,6 +940,10 @@ 

  %endif

  

  %changelog

+ * Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 4.13.1-5

+ - Use make macros

+ - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

+ 

  * Tue Jul 07 2020 Michael Young <m.a.young@durham.ac.uk> - 4.13.1-4

  - incorrect error handling in event channel port allocation leads to

  	DoS [XSA-317, CVE-2020-15566] (#1854465)

This pull request was create automatically for the f33 change:
https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro

Please review the patch and if you approve the changes, merge it after the simple-koji-ci test passes.

This pull request will be automatically merged in 1 week if there are not objections.

Pull-Request has been merged by myoung

3 years ago