From 9d24eceefc02c3603c8eff19e45114256cb9442c Mon Sep 17 00:00:00 2001
From: brent s <bts@square-r00t.net>
Date: Thu, 3 Sep 2020 20:11:31 -0400
Subject: [PATCH] pushing some changes

---
 schema/lib/elements/ipxe.xsd   |  2 +-
 schema/lib/types/ipxe.xsd      | 42 +++++++++++-----------------------
 schema/lib/types/sys.xsd       |  2 ++
 schema/projects/gomodh.xml     | 27 ++++++++++++++++++++++
 schema/projects/ipxe/build.xsd |  4 ++--
 5 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 schema/projects/gomodh.xml

diff --git a/schema/lib/elements/ipxe.xsd b/schema/lib/elements/ipxe.xsd
index a148397..20f152b 100644
--- a/schema/lib/elements/ipxe.xsd
+++ b/schema/lib/elements/ipxe.xsd
@@ -53,7 +53,7 @@
         <xs:element name="dest" minOccurs="1" maxOccurs="1" type="t_unix_dirpath"/>
         <xs:choice minOccurs="1" maxOccurs="1">
           <xs:element name="git" minOccurs="0" type="t_git_remote"/>
-          <xs:element name="tarball" minOccurs="0" type="t_ipxe_tarball"/>
+          <xs:element name="archive" minOccurs="0" type="t_ipxe_arcfile"/>
         </xs:choice>
       </xs:choice>
     </xs:sequence>
diff --git a/schema/lib/types/ipxe.xsd b/schema/lib/types/ipxe.xsd
index d4f93dc..df68ef4 100644
--- a/schema/lib/types/ipxe.xsd
+++ b/schema/lib/types/ipxe.xsd
@@ -16,9 +16,17 @@
 
   <xs:complexType name="t_ipxe_patch">
     <xs:sequence minOccurs="1" maxOccurs="unbounded">
-      <xs:element name="patchFile" minOccurs="1" maxOccurs="unbounded" type="t_unix_relfilepath"/>
+      <xs:element name="patchFile" minOccurs="1" maxOccurs="unbounded" type="t_ipxe_patch_file"/>
     </xs:sequence>
-    <xs:attribute name="patchDir" type="t_unix_anydir" use="optional"/>
+    <xs:attribute name="patchDir" type="t_unix_anydir" use="optional" default="."/>
+  </xs:complexType>
+
+  <xs:complexType name="t_ipxe_patch_file">
+    <xs:simpleContent>
+      <xs:extension base="t_unix_relfilepath">
+        <xs:attribute name="stripLevel" type="xs:positiveInteger" use="optional" default="1"/>
+      </xs:extension>
+    </xs:simpleContent>
   </xs:complexType>
 
   <xs:simpleType name="t_ipxe_patchopt">
@@ -28,39 +36,15 @@
     </xs:restriction>
   </xs:simpleType>
 
-  <xs:simpleType name="t_ipxe_rom_firmware">
-    <xs:restriction base="xs:token">
-      <!-- iPXE Makefile, target "ALL" -->
-      <xs:enumeration value="rtl8139"/>
-      <xs:enumeration value="8086100e"/>
-      <xs:enumeration value="80861209"/>
-      <xs:enumeration value="10500940"/>
-      <xs:enumeration value="10222000"/>
-      <xs:enumeration value="10ec8139"/>
-      <xs:enumeration value="1af41000"/>
-      <xs:enumeration value="8086100f"/>
-      <xs:enumeration value="808610d3"/>
-      <xs:enumeration value="15ad07b0"/>
-    </xs:restriction>
-  </xs:simpleType>
-
   <xs:complexType name="t_ipxe_rom_type">
     <xs:sequence minOccurs="1" maxOccurs="2">
       <xs:element name="romType" minOccurs="1"/>
     </xs:sequence>
   </xs:complexType>
 
-  <xs:simpleType name="t_ipxe_rom_type_types">
-    <xs:restriction base="xs:token">
-      <!-- iPXE Makefile, target "ALL" -->
-      <xs:enumeration value="rom"/>
-      <xs:enumeration value="mrom"/>
-    </xs:restriction>
-  </xs:simpleType>
-
   <xs:complexType name="t_ipxe_roms">
     <xs:sequence minOccurs="1">
-      <xs:element name="rom" type="t_ipxe_rom_firmware" minOccurs="1" maxOccurs="unbounded"/>
+      <xs:element name="rom" type="xs:token" minOccurs="1" maxOccurs="unbounded"/>
     </xs:sequence>
   </xs:complexType>
 
@@ -72,9 +56,9 @@
     </xs:simpleContent>
   </xs:complexType>
 
-  <xs:simpleType name="t_ipxe_tarball">
+  <xs:simpleType name="t_ipxe_arcfile">
     <xs:restriction base="xs:anyURI">
-      <xs:pattern value="https?://.*\.(tar\.((x|g)?z|bz2)?|zip)"/>
+      <xs:pattern value="(https?|file)://^.*\.(tar(\.((g|x)z|bz2?))?|t((g|x)z|bz2?)|zip)"/>
     </xs:restriction>
   </xs:simpleType>
 
diff --git a/schema/lib/types/sys.xsd b/schema/lib/types/sys.xsd
index 6e34b2e..8f12f8b 100644
--- a/schema/lib/types/sys.xsd
+++ b/schema/lib/types/sys.xsd
@@ -9,9 +9,11 @@
     <xs:simpleType name="t_sys_diskfmt">
         <xs:restriction base="xs:token">
             <xs:enumeration value="gpt"/>
+            <!-- The next four should all evaluate to the exact same in-code. -->
             <xs:enumeration value="bios"/>
             <xs:enumeration value="dos"/>
             <xs:enumeration value="msdos"/>
+            <xs:enumeration value="mbr"/>
             <xs:whiteSpace value="collapse"/>
         </xs:restriction>
     </xs:simpleType>
diff --git a/schema/projects/gomodh.xml b/schema/projects/gomodh.xml
new file mode 100644
index 0000000..926d20c
--- /dev/null
+++ b/schema/projects/gomodh.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema targetNamespace="https://go.r00t2.io/"
+           xmlns="https://go.r00t2.io/"
+           xmlns:gomodh="https://go.r00t2.io/"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+
+  <xs:include schemaLocation="../lib/types/net.xsd"/>
+  <xs:include schemaLocation="../lib/types/unix.xsd"/>
+
+  <xs:element name="gomodh">
+    <xs:complexType>
+      <xs:choice minOccurs="1" maxOccurs="unbounded">
+        <xs:element name="mod">
+          <xs:complexType>
+            <xs:attribute name="name" type="t_unix_portablePosixFilename" use="required"/>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="pkg">
+
+        </xs:element>
+      </xs:choice>
+      <xs:attribute name="baseURL" type="t_net_http_basic_uri" use="required"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/schema/projects/ipxe/build.xsd b/schema/projects/ipxe/build.xsd
index 5561128..d955bd8 100644
--- a/schema/projects/ipxe/build.xsd
+++ b/schema/projects/ipxe/build.xsd
@@ -33,8 +33,8 @@
         </xs:element>
         <xs:element name="build">
           <xs:complexType>
-            <xs:sequence minOccurs="1" maxOccurs="3">
-              <xs:choice minOccurs="1" maxOccurs="3">
+            <xs:sequence minOccurs="1" maxOccurs="4">
+              <xs:choice minOccurs="1" maxOccurs="4">
                 <xs:element name="dest" minOccurs="1" maxOccurs="1" type="t_unix_dirpath"/>
                 <xs:element name="scripts" minOccurs="1" maxOccurs="1" type="e_ipxe_scripts"/>
                 <xs:element name="roms" minOccurs="1" maxOccurs="1" type="t_ipxe_roms"/>