From e92e54bc6b55c64002c62c37fb3b46c3f3b8d77f Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 8 Jul 2009 14:07:11 +0000 Subject: [PATCH] -Refine custom packaging of gPXE --- gpxe/gpxe-0.9.7-config.patch | 11 +++++------ gpxe/{gpxe-undi.spec => xnba-undi.spec} | 21 +++++++++++++-------- 2 files changed, 18 insertions(+), 14 deletions(-) rename gpxe/{gpxe-undi.spec => xnba-undi.spec} (55%) diff --git a/gpxe/gpxe-0.9.7-config.patch b/gpxe/gpxe-0.9.7-config.patch index b6aa345..f047620 100644 --- a/gpxe/gpxe-0.9.7-config.patch +++ b/gpxe/gpxe-0.9.7-config.patch @@ -1,6 +1,6 @@ -diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-configed/src/config/general.h +diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-config/src/config/general.h --- gpxe-0.9.7/src/config/general.h 2009-03-01 21:23:42.000000000 -0500 -+++ gpxe-0.9.7-configed/src/config/general.h 2009-06-23 06:22:55.000000000 -0400 ++++ gpxe-0.9.7-config/src/config/general.h 2009-06-23 12:49:23.000000000 -0400 @@ -48,7 +48,7 @@ #undef DOWNLOAD_PROTO_NFS /* Network File System */ #define DOWNLOAD_PROTO_HTTP /* Hypertext Transfer Protocol */ @@ -19,7 +19,7 @@ diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-configed/src/config/general /* * Name resolution modules -@@ -76,31 +76,31 @@ +@@ -76,16 +76,16 @@ * you want to use. * */ @@ -33,7 +33,6 @@ diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-configed/src/config/general -//#define IMAGE_SCRIPT /* gPXE script image support */ -//#define IMAGE_BZIMAGE /* Linux bzImage image support */ -//#define IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ --//#define IMAGE_EFI /* EFI image support */ +#define IMAGE_NBI /* NBI image support */ +#define IMAGE_ELF /* ELF image support */ +#define IMAGE_FREEBSD /* FreeBSD kernel image support */ @@ -44,10 +43,10 @@ diff -urN gpxe-0.9.7/src/config/general.h gpxe-0.9.7-configed/src/config/general +#define IMAGE_SCRIPT /* gPXE script image support */ +#define IMAGE_BZIMAGE /* Linux bzImage image support */ +#undef IMAGE_COMBOOT /* SYSLINUX COMBOOT image support */ -+#define IMAGE_EFI /* EFI image support */ + //#define IMAGE_EFI /* EFI image support */ /* - * Command-line commands to include +@@ -93,14 +93,14 @@ * */ #define AUTOBOOT_CMD /* Automatic booting */ diff --git a/gpxe/gpxe-undi.spec b/gpxe/xnba-undi.spec similarity index 55% rename from gpxe/gpxe-undi.spec rename to gpxe/xnba-undi.spec index bdc1248..d7988a4 100644 --- a/gpxe/gpxe-undi.spec +++ b/gpxe/xnba-undi.spec @@ -1,7 +1,9 @@ -Name: gpxe-undi +Name: xnba-undi Version: 0.9.7 -Release: 3 -Summary: gPXE loader for PXE clients +Release: 5 +Summary: xCAT Network Boot Agent for x86 PXE hosts +Obsoletes: gpxe-xcat +Obsoletes: gpxe-undi Group: System Environment/Kernel License: GPL @@ -17,10 +19,11 @@ BuildArch: noarch Source0: gpxe-0.9.7.tar.gz Patch0: gpxe-0.9.7-branding.patch Patch1: gpxe-0.9.7-registeriscsionpxe.patch -Patch2: gpxe-0.9.7-undiconfig.patch +Patch2: gpxe-0.9.7-config.patch +Patch3: gpxe-0.9.7-ignorepackets.patch %description -The gPXE network bootloader provides enhanced boot features for any UNDI compliant x86 host. This includes iSCSI, http/ftp downloads, and gPXE script based booting. +The xCAT Network Boot Agent is a slightly modified version of gPXE. It provides enhanced boot features for any UNDI compliant x86 host. This includes iSCSI, http/ftp downloads, and gPXE script based booting. %prep @@ -28,6 +31,7 @@ The gPXE network bootloader provides enhanced boot features for any UNDI complia %patch -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build @@ -39,8 +43,9 @@ make bin/undionly.kpxe %install -mkdir -p %{buildroot}/tftpboot/ -cp src/bin/undionly.kpxe %{buildroot}/tftpboot/undionly.kpxe +mkdir -p %{buildroot}/tftpboot/xcat +#Rename to avoid conflicting with potential vanilla undionly.kpxe that user may be using +cp src/bin/undionly.kpxe %{buildroot}/tftpboot/xcat/xnba.kpxe %post @@ -51,5 +56,5 @@ cp src/bin/undionly.kpxe %{buildroot}/tftpboot/undionly.kpxe %{__rm} -rf %{buildroot} %files -/tftpboot/undionly.kpxe +/tftpboot/xcat/xnba.kpxe %changelog