[fedora-virt-maint] rpms/etherboot/devel etherboot.spec,1.9,1.10
Glauber Costa
glommer at fedoraproject.org
Mon Mar 2 19:58:07 UTC 2009
Author: glommer
Update of /cvs/pkgs/rpms/etherboot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25809
Modified Files:
etherboot.spec
Log Message:
more prebuilt binaries. Koji now supports noarch subpackages
Index: etherboot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/etherboot/devel/etherboot.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- etherboot.spec 24 Feb 2009 15:32:32 -0000 1.9
+++ etherboot.spec 2 Mar 2009 19:57:36 -0000 1.10
@@ -2,11 +2,9 @@
# the arches where we are able to actually build the binaries.
# on the other arches, we will use the prebuilt binaries
-%define real_build_arches %{ix86} x86_64
-
Name: etherboot
Version: 5.4.4
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: Etherboot collection of boot roms
Group: Development/Tools
@@ -17,47 +15,46 @@
#Source0: http://kernel.org/pub/software/utils/boot/etherboot/%{name}-%{version}.tar.gz
# The source without proto_fsp.c:
Source0: %{name}-%{version}-nofsp.tar.gz
-# prebuilt binaries, from etherboot-*-5.4.4-6.fc11.i386.rpm:
-Source1: etherboot-binaries-5.4.4-6.fc11.i386.tar.bz
# The script used to remove the proto_fsp.c files:
Source2: strip-etherboot-tarball.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%ifarch %{real_build_arches}
-%ifarch x86_64
-BuildRequires: glibc32
-%endif
BuildRequires: perl
BuildRequires: syslinux
BuildRequires: mtools
-%endif
+BuildArch: %{ix86}
%package pxes
Summary: Etherboot - boot roms in .pxe format
Group: Development/Tools
+BuildArch: noarch
%package roms
Summary: Etherboot - boot roms in .rom format
Group: Development/Tools
Requires: %{name}-roms-kvm
+BuildArch: noarch
%package roms-kvm
Summary: Etherboot - boot roms supported by KVM, .rom format
Group: Development/Tools
+BuildArch: noarch
%package zroms
Summary: Etherboot - boot roms in .zrom format
Group: Development/Tools
Requires: %{name}-zroms-kvm
+BuildArch: noarch
%package zroms-kvm
Summary: Etherboot - boot roms supported by KVM, .zrom format
Group: Development/Tools
+BuildArch: noarch
@@ -106,40 +103,20 @@
%prep
%setup -q
-%ifnarch %{real_build_arches}
-# can't build the images on this arch. extract the prebuilt ones:
-mkdir src/prebuilt
-cd src/prebuilt
-tar -jxf %{SOURCE1}
-%endif
-
%build
cd src
-%ifarch %{real_build_arches}
-
# %{optflags} wouldn't work with our hack to build the 32-bit binaries
# on x86_64, so use %{__global_cflags} instead, that doesn't include
# -m64 & related flags
%define extra_cflags `echo %{__global_cflags} |sed 's|-fstack-protector||g'`
-
-%ifarch x86_64
-# flags needed to build the 32-bit binaries on x86_64
-%define makeflags ARCH=i386 EXTRA_CFLAGS="%{extra_cflags} -m32" EXTRA_ASFLAGS="--32" EXTRA_LDFLAGS="-m elf_i386"
-%else
%define makeflags EXTRA_CFLAGS="%{extra_cflags}"
-%endif
+
# undi is broken by now
sed -i -e '/undi/d' Families
make %{?_smp_mflags} allpxes allroms allzroms %{makeflags}
-%else
-# Simply copy the prebuilt binaries:
-cp prebuilt/etherboot/* bin/
-%endif
-
-
%install
rm -rf %{buildroot}
@@ -189,6 +166,9 @@
%changelog
+* Mon Mar 02 2009 Glauber Costa <glommer at redhat.com> - 5.4.5-10
+- No more prebuilt binaries. Koji now supports noarch subpackages
+
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.4.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the Fedora-virt-maint
mailing list