xCAT/xcat-dep
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-dep.git synced 2024-11-21 09:01:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44 from xcat2/xnba_snponly

Browse Source 
Use snponly.efi instead of ipxe.efi
This commit is contained in:
besawn 2021-06-14 12:02:12 -04:00 committed by GitHub
commit 2f62f9cc0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 43 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xnba/README
View File

@ -11,20 +11,30 @@ 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 <new branch>
2. Checkin the generated xnba-<version>.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.
The following patches contain modification for xCAT Network Boot Agent
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 currently contain modification for xCAT Network Boot Agent
ipxe-xnbaclass.patch
ipxe-machyp.patch
ipxe-dhcp.patch
ipxe-branding.patch
ipxe-verbump.patch
3.a To modify existing or create additional patch file:
i. git clone git://git.ipxe.org/ipxe.git
ii. Make changes to the files under ipxei/src directory
iii. git diff <changed file>
iv. If creating a new patch, place output of the command above into the .patch file.
v. If modifying existong patch, replace the contnts of the .patch file with the output of the command above.
vi. Be carefull of spaces vs. tabs. If original source file contained tabs, the .patch file should also have tabs for the patched lines.
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-<version>.tar.bz2 from cloned git directory into /root/rpmbuild/SOURCES/
2. Copy 5 patch files listed above and xnba-<version>.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-<version>.noarch.rpm into /gsa/pokgsa/projects/x/xcat/build/linux/xcat-dep/

BIN
xnba/binary/xnba.efi
View File

Binary file not shown.

BIN
xnba/binary/xnba.kpxe
View File

Binary file not shown.

6
xnba/debian/changelog
View File

@ -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 <gurevich@us.ibm.com> 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

2
xnba/debian/control
View File

@ -3,7 +3,7 @@ Section: admin
Priority: extra
Maintainer: xCAT <xcat-user@lists.sourceforge.net>
Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 1.20.1
Standards-Version: 1.20.1-1
#Homepage: <insert the upstream URL, if relevant>
#Vcs-Git: git://git.debian.org/collab-maint/gpxe.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/gpxe.git;a=summary

2
xnba/debian/files
View File

@ -1 +1 @@
xnba-undi_1.20.1-0_amd64.deb admin extra
xnba-undi_1.20.1-1_amd64.deb admin extra

1
xnba/debian/patches/ipxe-verbump.patch Symbolic link
View File

@ -0,0 +1 @@
../../ipxe-verbump.patch

1
xnba/debian/patches/series
View File

@ -2,3 +2,4 @@ ipxe-branding.patch
ipxe-xnbaclass.patch
ipxe-machyp.patch
ipxe-dhcp.patch
ipxe-verbump.patch

4
xnba/debian/rules
View File

@ -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/<packagename>
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

23
xnba/ipxe-verbump.patch
View File

@ -1,14 +1,17 @@
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..50277ae9 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -222,9 +222,9 @@ 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 = -1
endif
MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR)
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)
CFLAGS += -DVERSION_MAJOR=$(VERSION_MAJOR) \
VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)

8
xnba/xnba-undi.spec
View File

@ -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
Patch5: 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