Package init

ipxe.spec

@@ -1,12 +1,12 @@
 %global formats rom
 %global qemuroms 10222000 10ec8029 8086100e 10ec8139 1af41000 80861209 808610d3 15ad07b0
-%global buildarches %{ix86} x86_64
+%global buildarches x86_64
 %global debug_package %{nil}
 %global hash 3fe683e
 
 Name:                ipxe
 Version:             20190930
-Release:             3
+Release:             4
 Summary:             A network boot loader
 
 License:             GPLv2 with additional permissions and BSD
@@ -16,8 +16,8 @@ Patch0001:           0001-build-customize-configuration.patch
 Patch0002:           0002-Use-spec-compliant-timeouts.patch
 
 %ifarch %{buildarches}
-BuildRequires:       perl-interpreter perl-Getopt-Long syslinux mtools genisoimage edk2-tools
-BuildRequires:       xz-devel gcc binutils-devel binutils-x86_64-linux-gnu gcc-x86_64-linux-gnu
+BuildRequires:       perl-interpreter perl-Getopt-Long syslinux mtools genisoimage edk2-devel
+BuildRequires:       xz-devel gcc binutils-devel
 Obsoletes:           gpxe-bootimgs gpxe-roms gpxe-roms-qem
 Provides:            %{name}-bootimgs %{name}-roms %{name}-roms-qemu
 Obsoletes:           %{name}-bootimgs %{name}-roms %{name}-roms-qemu
@@ -44,7 +44,6 @@ make_ipxe() {
     make %{?_smp_mflags} \
         NO_WERROR=1 V=1 \
         GITVERSION=%{hash} \
-        CROSS_COMPILE=x86_64-linux-gnu- \
         "$@"
 }
 
@@ -57,13 +56,11 @@ make_ipxe ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin \
 mkdir bin-combined
 for rom in %{qemuroms}; do
   make_ipxe CONFIG=qemu bin/${rom}.rom
-  make_ipxe CONFIG=qemu bin-i386-efi/${rom}.efidrv
   make_ipxe CONFIG=qemu bin-x86_64-efi/${rom}.efidrv
   vid="0x${rom%%????}"
   did="0x${rom#????}"
   EfiRom -f "$vid" -i "$did" --pci23 \
          -b  bin/${rom}.rom \
-         -ec bin-i386-efi/${rom}.efidrv \
          -ec bin-x86_64-efi/${rom}.efidrv \
          -o  bin-combined/${rom}.rom
   EfiRom -d  bin-combined/${rom}.rom
@@ -119,10 +116,17 @@ done
 %{_datadir}/%{name}/ipxe-i386.efi
 %{_datadir}/%{name}/ipxe-x86_64.efi
 %{_datadir}/%{name}/undionly.kpxe
+%{_datadir}/%{name}/*.rom
 %{_datadir}/%{name}.efi/*.rom
 %endif
 
 %changelog
+* Fri Nov 29 2019 openEuler Buildteam <buildteam@openeuler.org> - 20190125-4
+- Type:bugfix
+- Id:NA
+- SUG:NA
+- DESC: fix build error on x86_64
+
 * Sat Oct 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 20190125-3
 - Type:bugfix
 - Id:NA