From 5971782d0f02b404a2af89e9e3b7718e4fe369b5 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 3 Jan 2013 09:21:29 +0000 Subject: [PATCH] Update to latest GIT snapshot --- ipxe.spec | 18 ++++++++++++++---- sources | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ipxe.spec b/ipxe.spec index fb48442..e78b44d 100644 --- a/ipxe.spec +++ b/ipxe.spec @@ -31,12 +31,12 @@ # # And then change these two: -%global date 20120328 -%global hash aac9718 +%global date 20130103 +%global hash 717279a Name: ipxe Version: %{date} -Release: 2.git%{hash}%{?dist} +Release: 1.git%{hash}%{?dist} Summary: A network boot loader Group: System Environment/Base @@ -113,6 +113,12 @@ cp -a %{SOURCE1} . %build %ifarch %{buildarches} +# The src/Makefile.housekeeping relies on .git/index existing +# but since we pass GITVERSION= to make, we don't actally need +# it to be the real deal, so just touch it to let the build pass +mkdir .git +touch .git/index + ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin cd src # ath9k drivers are too big for an Option ROM @@ -120,7 +126,8 @@ rm -rf drivers/net/ath/ath9k #make %{?_smp_mflags} bin/undionly.kpxe bin/ipxe.{dsk,iso,usb,lkrn} allroms \ make bin/undionly.kpxe bin/ipxe.{dsk,iso,usb,lkrn} allroms \ - ISOLINUX_BIN=${ISOLINUX_BIN} NO_WERROR=1 V=1 + ISOLINUX_BIN=${ISOLINUX_BIN} NO_WERROR=1 V=1 \ + GITVERSION=%{hash} %endif %install @@ -170,6 +177,9 @@ done %endif %changelog +* Thu Jan 3 2013 Daniel P. Berrange - 20130103-1.git717279a +- Updated to latest GIT snapshot + * Thu Jul 19 2012 Fedora Release Engineering - 20120328-2.gitaac9718 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index f1fb2dd..b0d42db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6f6f6367cdcb9fcdae480e08955c77a1 ipxe-20120328-gitaac9718.tar.gz +028f4efe40197717a6d696ea3d2d7f6e ipxe-20130103-git717279a.tar.gz