From b49782536ec71631ddb7edf21e8e8c9853c8ac22 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Tue, 8 Jun 2021 15:36:26 -0400 Subject: [PATCH] Use snponly.efi instead of ipxe.efi --- xnba/README | 5 +++-- xnba/debian/changelog | 6 ++++++ xnba/debian/control | 2 +- xnba/debian/files | 2 +- xnba/debian/patches/ipxe-verbump.patch | 1 + xnba/debian/patches/series | 1 + xnba/debian/rules | 4 ++-- xnba/ipxe-verbump.patch | 23 ++++++++++++----------- xnba/xnba-undi.spec | 8 +++++--- 9 files changed, 32 insertions(+), 20 deletions(-) create mode 120000 xnba/debian/patches/ipxe-verbump.patch diff --git a/xnba/README b/xnba/README index f15edae..f0384a7 100644 --- a/xnba/README +++ b/xnba/README @@ -11,20 +11,21 @@ Build xNBA rpm for xcat-dep 1. Clone xcat-dep/xnba and create a new branch: git clone git@github.com:xcat2/xcat-dep.git; cd xcat-dep; git checkout -b 2. Checkin the generated xnba-.tar.bz2 file from above into git -3. Modify patch files if needed and checkin into git. The patch files will automatically be applied during build step below. +3. If needed, modify existing or create additional patch files and checkin into git. The patch files will automatically be applied during build step below. The following patches contain modification for xCAT Network Boot Agent ipxe-xnbaclass.patch ipxe-machyp.patch ipxe-dhcp.patch ipxe-branding.patch + ipxe-verbump.patch 4. On x86 build machine, checkout the branch created above: git clone https://github.com/xcat2/xcat-dep.git; cd xcat-dep; For linux --------- 1. On x86 RHEL machine, install required package: xz-devel and gcc -2. Copy 4 patch files listed above and xnba-.tar.bz2 from cloned git directory into /root/rpmbuild/SOURCES/ +2. Copy 5 patch files listed above and xnba-.tar.bz2 from cloned git directory into /root/rpmbuild/SOURCES/ 3. RPM build: cd xcat-dep/xnba; rpmbuild -ba xnba-undi.spec 4. Copy generated rpm /root/rpmbuild/RPMS/noarch/xnba-undi-.noarch.rpm into /gsa/pokgsa/projects/x/xcat/build/linux/xcat-dep/ diff --git a/xnba/debian/changelog b/xnba/debian/changelog index 3da9dc6..b0daadd 100644 --- a/xnba/debian/changelog +++ b/xnba/debian/changelog @@ -1,3 +1,9 @@ +xnba-undi (1.20.1-1) unstable; urgency=low + + * Debian build for xnba-undi version 1.20.1-1 + + -- Mark Gurevich Tue, 8 Jun 2021 15:49:48 +0800 + xnba-undi (1.20.1-0) unstable; urgency=low * Debian build for xnba-undi version 1.20.1 diff --git a/xnba/debian/control b/xnba/debian/control index 3d67a7d..ddd47ca 100644 --- a/xnba/debian/control +++ b/xnba/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: extra Maintainer: xCAT Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 1.20.1 +Standards-Version: 1.20.1-1 #Homepage: #Vcs-Git: git://git.debian.org/collab-maint/gpxe.git #Vcs-Browser: http://git.debian.org/?p=collab-maint/gpxe.git;a=summary diff --git a/xnba/debian/files b/xnba/debian/files index de9918d..0be69e8 100644 --- a/xnba/debian/files +++ b/xnba/debian/files @@ -1 +1 @@ -xnba-undi_1.20.1-0_amd64.deb admin extra +xnba-undi_1.20.1-1_amd64.deb admin extra diff --git a/xnba/debian/patches/ipxe-verbump.patch b/xnba/debian/patches/ipxe-verbump.patch new file mode 120000 index 0000000..53e2845 --- /dev/null +++ b/xnba/debian/patches/ipxe-verbump.patch @@ -0,0 +1 @@ +../../ipxe-verbump.patch \ No newline at end of file diff --git a/xnba/debian/patches/series b/xnba/debian/patches/series index ef32fe3..d5cd500 100644 --- a/xnba/debian/patches/series +++ b/xnba/debian/patches/series @@ -2,3 +2,4 @@ ipxe-branding.patch ipxe-xnbaclass.patch ipxe-machyp.patch ipxe-dhcp.patch +ipxe-verbump.patch diff --git a/xnba/debian/rules b/xnba/debian/rules index 9210b48..0632834 100755 --- a/xnba/debian/rules +++ b/xnba/debian/rules @@ -13,7 +13,7 @@ build-stamp: dh_quilt_patch # Add here commands to compile the package. $(MAKE) -C src bin/undionly.kkpxe - $(MAKE) -C src bin-x86_64-efi/ipxe.efi + $(MAKE) -C src bin-x86_64-efi/snponly.efi touch build-stamp @@ -34,7 +34,7 @@ install: build # Add here commands to install the package into debian/ cp src/bin/undionly.kkpxe `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.kpxe - cp src/bin-x86_64-efi/ipxe.efi `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi + cp src/bin-x86_64-efi/snponly.efi `pwd`/debian/`dh_listpackages`/tftpboot/xcat/xnba.efi #dh_movefiles diff --git a/xnba/ipxe-verbump.patch b/xnba/ipxe-verbump.patch index a87f5c0..47d8d60 100644 --- a/xnba/ipxe-verbump.patch +++ b/xnba/ipxe-verbump.patch @@ -1,14 +1,15 @@ -diff -urN ipxe/src/Makefile ipxe-verbump/src/Makefile ---- ipxe/src/Makefile 2010-11-12 11:04:06.000000000 -0500 -+++ ipxe-verbump/src/Makefile 2010-11-12 11:13:11.000000000 -0500 -@@ -153,8 +153,8 @@ - # +diff --git a/src/Makefile b/src/Makefile +index 69139dc1..99c1b0ed 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -222,8 +222,8 @@ endif + GITVERSION = $(word 5,$(VERSION_TUPLE)) + else VERSION_MAJOR = 1 - VERSION_MINOR = 0 +-VERSION_MINOR = 0 -VERSION_PATCH = 0 --EXTRAVERSION = + -+VERSION_PATCH = 2 -+EXTRAVERSION = X ++VERSION_MINOR = 20 ++VERSION_PATCH = 1 + EXTRAVERSION = + + endif MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) - VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION) - CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) \ diff --git a/xnba/xnba-undi.spec b/xnba/xnba-undi.spec index 1acbcc7..f58dd12 100644 --- a/xnba/xnba-undi.spec +++ b/xnba/xnba-undi.spec @@ -1,6 +1,6 @@ Name: xnba-undi Version: 1.20.1 -Release: 0 +Release: 1 Summary: xCAT Network Boot Agent for x86 PXE hosts Group: System Environment/Kernel @@ -19,6 +19,7 @@ Patch1: ipxe-branding.patch Patch2: ipxe-machyp.patch Patch3: ipxe-xnbaclass.patch Patch4: ipxe-dhcp.patch +Patch4: ipxe-verbump.patch %description The xCAT Network Boot Agent is a slightly modified version of iPXE. It provides enhanced boot features for any UNDI compliant x86 host. This includes iSCSI, http/ftp downloads, and iPXE script based booting. @@ -30,6 +31,7 @@ The xCAT Network Boot Agent is a slightly modified version of iPXE. It provides %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build @@ -37,7 +39,7 @@ rm -rf %{buildroot} cd src make bin/undionly.kkpxe -make bin-x86_64-efi/ipxe.efi +make bin-x86_64-efi/snponly.efi %install @@ -45,7 +47,7 @@ make bin-x86_64-efi/ipxe.efi mkdir -p %{buildroot}/tftpboot/xcat #Rename to avoid conflicting with potential vanilla undionly.kpxe that user may be using cp src/bin/undionly.kkpxe %{buildroot}/tftpboot/xcat/xnba.kpxe -cp src/bin-x86_64-efi/ipxe.efi %{buildroot}/tftpboot/xcat/xnba.efi +cp src/bin-x86_64-efi/snponly.efi %{buildroot}/tftpboot/xcat/xnba.efi %post