From 82b919958a5914da69119b5447982d3f61ca7ea1 Mon Sep 17 00:00:00 2001
From: r00t <bts@square-r00t.net>
Date: Wed, 14 Dec 2016 01:31:51 -0500
Subject: [PATCH] yay! iPXE fixed. but i can definitely implement the usb and
 iso better by hand.

---
 bdisk/host.py |  9 +++++++--
 bdisk/ipxe.py | 23 ++++++++++++-----------
 docs/TODO     |  1 +
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/bdisk/host.py b/bdisk/host.py
index 12a9466..15b9455 100755
--- a/bdisk/host.py
+++ b/bdisk/host.py
@@ -82,6 +82,13 @@ def parseConfig(confs):
     # Two possibilities.
     # e.g. 1 commit after tag with 7-digit object hex: ['v3.10', '1', 'gb4a5e40']
     # Or if were sitting on a tag with no commits: ['v3.10']
+    # So we want our REAL version to be the following:
+    # Tagged release:  v#.##
+    # X number of commits after release: v#.##rX
+    # Both have the (local) build number appended to the deliverables,
+    # which is reset for an empty isodir OR a new tagged release (incl.
+    # commits on top of a new tagged release). e.g. for build Y:
+    # v#.##-Y or v#.##rX-Y
     if config_dict['bdisk']['ver'] == '':
         repo = git.Repo(config_dict['build']['basedir'])
         refs = repo.git.describe(repo.head.commit).split('-')
@@ -89,8 +96,6 @@ def parseConfig(confs):
             config_dict['bdisk']['ver'] = refs[0] + 'r' + refs[1]
         else:
             config_dict['bdisk']['ver'] = refs[0]
-    for i in ('http', 'tftp', 'rsync', 'git'):
-        config_dict['sync'][i] = config['sync'].getboolean(i)
     # And the build number.
     # TODO: support tracking builds per version. i.e. in buildnum:
     # v2.51r13:0
diff --git a/bdisk/ipxe.py b/bdisk/ipxe.py
index 59e73c5..87149c6 100755
--- a/bdisk/ipxe.py
+++ b/bdisk/ipxe.py
@@ -106,22 +106,23 @@ def buildIPXE(conf):
     #modenv['CERT'] = '{0},{1}'.format(ipxe_ssl_ca, ipxe_ssl_crt)  # TODO: test these
     #modenv['PRIVKEY'] = ipxe_ssl_ckey  # TODO: test these
     build_cmd = {}
+    # This build include the USB image.
     build_cmd['base'] = ['/usr/bin/make',
-                    'all',
-                    'EMBED="{0}"'.format(embedscript)]
+                            'all',
+                            'EMBED={0}'.format(embedscript)]
     # TODO: copy the UNDI stuff/chainloader to tftpboot, if enabled
     build_cmd['undi'] = ['/usr/bin/make',
-                    'bin/ipxe.pxe',
-                    'EMBED="{0}"'.format(embedscript)]
+                            'bin/ipxe.pxe',
+                            'EMBED={0}'.format(embedscript)]
     build_cmd['efi'] = ['/usr/bin/make',
-                    'bin-i386-efi/ipxe.efi',
-                    'bin-x86_64-efi/ipxe.efi',
-                    'EMBED="{0}"'.format(embedscript)]
-    # Command to build the actual USB and Mini images
+                            'bin-i386-efi/ipxe.efi',
+                            'bin-x86_64-efi/ipxe.efi',
+                            'EMBED={0}'.format(embedscript)]
+    # Command to build the actual mini image
     build_cmd['iso'] = ['/usr/bin/make',
-                    'bin/ipxe.liso',
-                    'bin/ipxe.eiso',
-                    'EMBED="{0}"'.format(embedscript)]
+                            'bin/ipxe.liso',
+                            'bin/ipxe.eiso',
+                            'EMBED={0}'.format(embedscript)]
     # Now we call the commands.
     DEVNULL = open(os.devnull, 'w')
     if os.path.isfile(build['dlpath'] + '/ipxe.log'):
diff --git a/docs/TODO b/docs/TODO
index 65ae821..d625379 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -5,6 +5,7 @@
 -UPDATE THE README!
 -sizes of build iso files
 -GPG sigs on built files
+-fix the branding, etc. on ipxe. :(
 
 ## General ##