From 3dc366595c9244346b33c0eeb90096e6dcacac4a Mon Sep 17 00:00:00 2001
From: brent s <r00t@square-r00t.net>
Date: Fri, 19 Jun 2020 18:55:20 -0400
Subject: [PATCH] checking in some work

---
 builder/example.config.xml | 157 +++++++++++++++++++------------------
 1 file changed, 81 insertions(+), 76 deletions(-)

diff --git a/builder/example.config.xml b/builder/example.config.xml
index 58cd3aa..b100441 100644
--- a/builder/example.config.xml
+++ b/builder/example.config.xml
@@ -1,79 +1,84 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ipxe xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="https://router.r00t2.io/boootbox/ipxe/build/"
-        xsi:schemaLocation="https://router.r00t2.io/boootbox/ipxe/build/ http://schema.xml.r00t2.io/projects/ipxe/build.xsd">
-
-  <patchSet srcDir="/opt/builds/ipxe_build">
-    <switchOpts root="src">
-      <opts file="config/general.h">
-        <enable>
-          <opt>NET_PROTO_IPV6</opt>
-          <opt>DOWNLOAD_PROTO_HTTPS</opt>
-          <opt>DOWNLOAD_PROTO_FTP</opt>
-          <opt>DOWNLOAD_PROTO_NFS</opt>
-          <opt>HTTP_AUTH_NTLM</opt>
-          <!-- <opt>HTTP_ENC_PEERDIST</opt> -->
-          <!-- <opt>HTTP_HACK_GCE</opt> -->
-          <opt>NSLOOKUP_CMD</opt>
-          <opt>TIME_CMD</opt>
-          <opt>DIGEST_CMD</opt>
-          <opt>LOTEST_CMD</opt>
-          <opt>VLAN_CMD</opt>
-          <!-- Causes EFI to fail
-          <opt>PXE_CMD</opt> -->
-          <opt>REBOOT_CMD</opt>
-          <opt>POWEROFF_CMD</opt>
-          <!-- I *think* this causes EFI to fail. Can I build it directly as a target w/o enabling?
-          <opt>IMAGE_NBI</opt> -->
-          <!-- Causes EFI to fail, and is auto-enabled for what needs it.
-          <opt>IMAGE_ELF</opt> -->
-          <!-- Also enabled by default for MBR builds.
-          <opt>IMAGE_MULTIBOOT</opt> -->
-          <!-- Enabled where needed, etc.
-          <opt>IMAGE_SCRIPT</opt> -->
-          <!-- http://lists.ipxe.org/pipermail/ipxe-devel/2017-March/005510.html
-          <opt>IMAGE_BZIMAGE</opt> -->
-          <!-- Not really necessary since iPXE has native menus.
-          <opt>IMAGE_COMBOOT</opt> -->
-          <!--  Enabled by default for EFI builds, and causes build error on bin/ipxe.dsk.tmp
-          <opt>IMAGE_EFI</opt> -->
-          <!-- EFI builds fail with this. related to PXE_STACK/PXE_CMD?
-          <opt>IMAGE_PXE</opt> -->
-          <opt>IMAGE_TRUST_CMD</opt>
-          <opt>PCI_CMD</opt>
-          <opt>PARAM_CMD</opt>
-          <opt>NEIGHBOUR_CMD</opt>
-          <opt>PING_CMD</opt>
-          <opt>CONSOLE_CMD</opt>
-          <opt>IPSTAT_CMD</opt>
-          <opt>PROFSTAT_CMD</opt>
-          <opt>NTP_CMD</opt>
-          <opt>CERT_CMD</opt>
-        </enable>
-        <!--
-        <disable>
-          <opt>CRYPTO_80211_WEP</opt>
-          <opt>CRYPTO_80211_WPA</opt>
-          <opt>CRYPTO_80211_WPA2</opt>
-          <opt>IWMGMT_CMD</opt>
-        </disable>
-        -->
-      </opts>
-      <opts file="config/console.h">
-        <enable>
-          <opt>CONSOLE_FRAMEBUFFER</opt>
-        </enable>
-        <!--
-        <disable>
-          <opt></opt>
-        </disable>
-        -->
-      </opts>
-    </switchOpts>
-    <patch root="/opt/builds/patches/ipxe">
-      <patchFile>git-version.patch</patchFile>
-      <patchFile>git-version.patch</patchFile>
-    </patch>
-  </patchSet>
-
+      xmlns="https://router.r00t2.io/boootbox/ipxe/build/"
+      xsi:schemaLocation="https://router.r00t2.io/boootbox/ipxe/build/ http://schema.xml.r00t2.io/projects/ipxe/build.xsd">
+  <source srcDir="/opt/builds/ipxe_build">
+    <upstream>
+      <git>git://git.ipxe.org/ipxe.git</git>
+      <dest>/opt/builds/ipxe_src</dest>
+    </upstream>
+    <patchSet>
+      <switchOpts subDir="src">
+        <opts file="config/general.h">
+          <enable>
+            <opt>NET_PROTO_IPV6</opt>
+            <opt>DOWNLOAD_PROTO_HTTPS</opt>
+            <opt>DOWNLOAD_PROTO_FTP</opt>
+            <opt>DOWNLOAD_PROTO_NFS</opt>
+            <opt>HTTP_AUTH_NTLM</opt>
+            <!-- <opt>HTTP_ENC_PEERDIST</opt> -->
+            <!-- <opt>HTTP_HACK_GCE</opt> -->
+            <opt>NSLOOKUP_CMD</opt>
+            <opt>TIME_CMD</opt>
+            <opt>DIGEST_CMD</opt>
+            <opt>LOTEST_CMD</opt>
+            <opt>VLAN_CMD</opt>
+            <!-- Causes EFI to fail
+            <opt>PXE_CMD</opt> -->
+            <opt>REBOOT_CMD</opt>
+            <opt>POWEROFF_CMD</opt>
+            <!-- I *think* this causes EFI to fail. Can I build it directly as a target w/o enabling?
+            <opt>IMAGE_NBI</opt> -->
+            <!-- Causes EFI to fail, and is auto-enabled for what needs it.
+            <opt>IMAGE_ELF</opt> -->
+            <!-- Also enabled by default for MBR builds.
+            <opt>IMAGE_MULTIBOOT</opt> -->
+            <!-- Enabled where needed, etc.
+            <opt>IMAGE_SCRIPT</opt> -->
+            <!-- http://lists.ipxe.org/pipermail/ipxe-devel/2017-March/005510.html
+            <opt>IMAGE_BZIMAGE</opt> -->
+            <!-- Not really necessary since iPXE has native menus.
+            <opt>IMAGE_COMBOOT</opt> -->
+            <!--  Enabled by default for EFI builds, and causes build error on bin/ipxe.dsk.tmp
+            <opt>IMAGE_EFI</opt> -->
+            <!-- EFI builds fail with this. related to PXE_STACK/PXE_CMD?
+            <opt>IMAGE_PXE</opt> -->
+            <opt>IMAGE_TRUST_CMD</opt>
+            <opt>PCI_CMD</opt>
+            <opt>PARAM_CMD</opt>
+            <opt>NEIGHBOUR_CMD</opt>
+            <opt>PING_CMD</opt>
+            <opt>CONSOLE_CMD</opt>
+            <opt>IPSTAT_CMD</opt>
+            <opt>PROFSTAT_CMD</opt>
+            <opt>NTP_CMD</opt>
+            <opt>CERT_CMD</opt>
+          </enable>
+          <!--
+          <disable>
+            <opt>CRYPTO_80211_WEP</opt>
+            <opt>CRYPTO_80211_WPA</opt>
+            <opt>CRYPTO_80211_WPA2</opt>
+            <opt>IWMGMT_CMD</opt>
+          </disable>
+          -->
+        </opts>
+        <opts file="config/console.h">
+          <enable>
+            <opt>CONSOLE_FRAMEBUFFER</opt>
+          </enable>
+          <!--
+          <disable>
+            <opt></opt>
+          </disable>
+          -->
+        </opts>
+      </switchOpts>
+      <patch patchDir="/opt/builds/patches/ipxe">
+        <patchFile>git-version.patch</patchFile>
+        <patchFile>banner.patch</patchFile>
+        <patchFile>efi-iso.patch</patchFile>
+      </patch>
+    </patchSet>
+  </source>
 </ipxe>