diff --git a/xnba/README b/xnba/README index f0384a7..00c5c8a 100644 --- a/xnba/README +++ b/xnba/README @@ -12,7 +12,7 @@ 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. 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 + The following patches currently contain modification for xCAT Network Boot Agent ipxe-xnbaclass.patch ipxe-machyp.patch @@ -20,6 +20,15 @@ Build xNBA rpm for xcat-dep 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 + 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 diff --git a/xnba/ipxe-verbump.patch b/xnba/ipxe-verbump.patch index 47d8d60..ce902cc 100644 --- a/xnba/ipxe-verbump.patch +++ b/xnba/ipxe-verbump.patch @@ -1,15 +1,17 @@ diff --git a/src/Makefile b/src/Makefile -index 69139dc1..99c1b0ed 100644 +index 69139dc1..50277ae9 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -222,8 +222,8 @@ endif +@@ -222,9 +222,9 @@ endif GITVERSION = $(word 5,$(VERSION_TUPLE)) else VERSION_MAJOR = 1 -VERSION_MINOR = 0 -VERSION_PATCH = 0 +-EXTRAVERSION = + +VERSION_MINOR = 20 +VERSION_PATCH = 1 - EXTRAVERSION = + ++EXTRAVERSION = -1 endif MM_VERSION = $(VERSION_MAJOR).$(VERSION_MINOR) + VERSION = $(MM_VERSION).$(VERSION_PATCH)$(EXTRAVERSION)