rpms/gpxe/F-9 USAGE,1.1,1.2 gpxe.spec,1.1,1.2

[Matt Domsch]

Author: mdomsch

Update of /cvs/extras/rpms/gpxe/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22576

Modified Files:
	USAGE gpxe.spec 
Log Message:
add undionly.kpxe to -bootimgs, update USAGE accordingly


Index: USAGE
===================================================================
RCS file: /cvs/extras/rpms/gpxe/F-9/USAGE,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- USAGE	12 May 2009 12:14:19 -0000	1.1
+++ USAGE	20 May 2009 00:08:12 -0000	1.2
@@ -4,10 +4,13 @@ where /dev/fd0 is your floppy drive.  Th
 data already on the disk.
 
 To create a bootable USB key, type
-    cat /usr/share/gpxe.usb > /dev/sdX
+    cat /usr/share/gpxe/gpxe.usb > /dev/sdX
 where /dev/sdX is your USB key, and is *not* a real hard
 disk on your system.  This will erase any data already on
 the USB key.
 
 To create a bootable CD-ROM, burn the ISO image
-/usr/share/gpxe.iso to a blank CD-ROM.
+/usr/share/gpxe/gpxe.iso to a blank CD-ROM.
+
+http://www.etherboot.org/wiki/pxechaining describes how to chain boot
+from PXE into gPXE using /usr/share/gpxe/undionly.kpxe.


Index: gpxe.spec
===================================================================
RCS file: /cvs/extras/rpms/gpxe/F-9/gpxe.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gpxe.spec	12 May 2009 12:14:19 -0000	1.1
+++ gpxe.spec	20 May 2009 00:08:12 -0000	1.2
@@ -9,7 +9,7 @@
 
 Name:    gpxe
 Version: 0.9.7
-Release: 2%{?dist}
+Release: 4%{?dist}
 Summary: A network boot loader
 
 Group:   System Environment/Base
@@ -45,7 +45,8 @@ gPXE is an open source network bootloade
 replacement for proprietary PXE ROMs, with many extra features such as
 DNS, HTTP, iSCSI, etc.
 
-This package contains the gPXE boot images in USB, CD, and floppy formats.
+This package contains the gPXE boot images in USB, CD, floppy, and PXE
+UNDI formats.
 
 %description roms
 gPXE is an open source network bootloader. It provides a direct
@@ -75,8 +76,11 @@ cp -a %{SOURCE1} .
 
 %build
 %ifarch %{buildarches}
+# Fedora 10 and newer, location is in /usr/share.  Older is in /usr/lib.
+ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin
+[ -e /usr/lib/syslinux/isolinux.bin ] && ISOLINUX_BIN=/usr/lib/syslinux/isolinux.bin
 cd src
-make %{?_smp_mflags} ISOLINUX_BIN=/usr/share/syslinux/isolinux.bin
+make %{?_smp_mflags} ISOLINUX_BIN=${ISOLINUX_BIN}
 make %{?_smp_mflags} bin/gpxe.lkrn
 # The bnx2 firmware is too large to fit into an option ROM.
 rm drivers/net/bnx2*.[ch]
@@ -89,7 +93,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p %{buildroot}/%{_datadir}/%{name}/
 pushd src/bin/
 
-cp -a gpxe.{iso,usb,dsk,lkrn} %{buildroot}/%{_datadir}/%{name}/
+cp -a undionly.kpxe gpxe.{iso,usb,dsk,lkrn} %{buildroot}/%{_datadir}/%{name}/
 
 for fmt in %{formats};do
  for img in *.${fmt};do
@@ -122,6 +126,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/gpxe.usb
 %{_datadir}/%{name}/gpxe.dsk
 %{_datadir}/%{name}/gpxe.lkrn
+%{_datadir}/%{name}/undionly.kpxe
 %doc COPYING COPYRIGHTS USAGE
 
 %files roms -f rom.list
@@ -136,6 +141,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue May 19 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-4
+- add undionly.kpxe to -bootimgs
+
+* Tue May 12 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-3
+- handle isolinux changing paths
+
 * Sat May  9 2009 Matt Domsch <mdomsch at fedoraproject.org> - 0.9.7-2
 - add dist tag