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

---
 schema/lib/elements/ipxe.xsd   |  4 ++--
 schema/projects/ipxe/build.xsd | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/schema/lib/elements/ipxe.xsd b/schema/lib/elements/ipxe.xsd
index 73f1e56..0fcfe22 100644
--- a/schema/lib/elements/ipxe.xsd
+++ b/schema/lib/elements/ipxe.xsd
@@ -30,14 +30,14 @@
     <xs:sequence minOccurs="1" maxOccurs="unbounded">
       <xs:element name="opts" minOccurs="1" maxOccurs="unbounded" type="e_ipxe_opts"/>
     </xs:sequence>
-    <xs:attribute name="root" type="t_unix_reldirpath" use="optional"/>
+    <xs:attribute name="subDir" type="t_unix_reldirpath" use="optional"/>
   </xs:complexType>
   
   <xs:complexType name="e_ipxe_patch">
     <xs:sequence minOccurs="1" maxOccurs="unbounded">
       <xs:element name="patchFile" minOccurs="1" maxOccurs="unbounded" type="t_unix_relfilepath"/>
     </xs:sequence>
-    <xs:attribute name="root" type="t_unix_reldirpath" use="optional"/>
+    <xs:attribute name="patchDir" type="t_unix_anydir" use="optional"/>
   </xs:complexType>
 
 </xs:schema>
diff --git a/schema/projects/ipxe/build.xsd b/schema/projects/ipxe/build.xsd
index 8028013..527156e 100644
--- a/schema/projects/ipxe/build.xsd
+++ b/schema/projects/ipxe/build.xsd
@@ -13,15 +13,23 @@
   <xs:element name="ipxe">
     <xs:complexType>
       <xs:all minOccurs="1">
-        <xs:element name="patchSet">
+        <xs:element name="source">
           <xs:complexType>
-            <xs:sequence minOccurs="1" maxOccurs="2">
-              <xs:element name="switchOpts" maxOccurs="1" type="e_ipxe_optswitch"/>
-              <xs:element name="patch" maxOccurs="1" type="e_ipxe_patch"/>
+            <xs:sequence minOccurs="0">
+              <xs:element name="patchSet" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence minOccurs="1" maxOccurs="2">
+                    <xs:element name="switchOpts" maxOccurs="1" type="e_ipxe_optswitch"/>
+                    <xs:element name="patch" maxOccurs="1" type="e_ipxe_patch"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
             </xs:sequence>
-            <xs:attribute name="srcDir" type="t_unix_dirpath" use="optional"/>
+            <xs:attribute name="srcDir" type="t_unix_dirpath" use="required"/>
+            <xs:attribute name="upstream" type="xs:anyURI" use="required"/>
           </xs:complexType>
         </xs:element>
+        <xs:element name="build"/>
       </xs:all>
     </xs:complexType>
   </xs:element>