pushing some changes

This commit is contained in:
brent s. 2020-09-03 20:11:31 -04:00
parent 1f9a4ed88d
commit 9d24eceefc
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
5 changed files with 45 additions and 32 deletions

View File

@ -53,7 +53,7 @@
<xs:element name="dest" minOccurs="1" maxOccurs="1" type="t_unix_dirpath"/> <xs:element name="dest" minOccurs="1" maxOccurs="1" type="t_unix_dirpath"/>
<xs:choice minOccurs="1" maxOccurs="1"> <xs:choice minOccurs="1" maxOccurs="1">
<xs:element name="git" minOccurs="0" type="t_git_remote"/> <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:choice> </xs:choice>
</xs:sequence> </xs:sequence>

View File

@ -16,9 +16,17 @@


<xs:complexType name="t_ipxe_patch"> <xs:complexType name="t_ipxe_patch">
<xs:sequence minOccurs="1" maxOccurs="unbounded"> <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: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:complexType>


<xs:simpleType name="t_ipxe_patchopt"> <xs:simpleType name="t_ipxe_patchopt">
@ -28,39 +36,15 @@
</xs:restriction> </xs:restriction>
</xs:simpleType> </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:complexType name="t_ipxe_rom_type">
<xs:sequence minOccurs="1" maxOccurs="2"> <xs:sequence minOccurs="1" maxOccurs="2">
<xs:element name="romType" minOccurs="1"/> <xs:element name="romType" minOccurs="1"/>
</xs:sequence> </xs:sequence>
</xs:complexType> </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:complexType name="t_ipxe_roms">
<xs:sequence minOccurs="1"> <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:sequence>
</xs:complexType> </xs:complexType>


@ -72,9 +56,9 @@
</xs:simpleContent> </xs:simpleContent>
</xs:complexType> </xs:complexType>


<xs:simpleType name="t_ipxe_tarball"> <xs:simpleType name="t_ipxe_arcfile">
<xs:restriction base="xs:anyURI"> <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:restriction>
</xs:simpleType> </xs:simpleType>



View File

@ -9,9 +9,11 @@
<xs:simpleType name="t_sys_diskfmt"> <xs:simpleType name="t_sys_diskfmt">
<xs:restriction base="xs:token"> <xs:restriction base="xs:token">
<xs:enumeration value="gpt"/> <xs:enumeration value="gpt"/>
<!-- The next four should all evaluate to the exact same in-code. -->
<xs:enumeration value="bios"/> <xs:enumeration value="bios"/>
<xs:enumeration value="dos"/> <xs:enumeration value="dos"/>
<xs:enumeration value="msdos"/> <xs:enumeration value="msdos"/>
<xs:enumeration value="mbr"/>
<xs:whiteSpace value="collapse"/> <xs:whiteSpace value="collapse"/>
</xs:restriction> </xs:restriction>
</xs:simpleType> </xs:simpleType>

View File

@ -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>

View File

@ -33,8 +33,8 @@
</xs:element> </xs:element>
<xs:element name="build"> <xs:element name="build">
<xs:complexType> <xs:complexType>
<xs:sequence minOccurs="1" maxOccurs="3"> <xs:sequence minOccurs="1" maxOccurs="4">
<xs:choice minOccurs="1" maxOccurs="3"> <xs:choice minOccurs="1" maxOccurs="4">
<xs:element name="dest" minOccurs="1" maxOccurs="1" type="t_unix_dirpath"/> <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="scripts" minOccurs="1" maxOccurs="1" type="e_ipxe_scripts"/>
<xs:element name="roms" minOccurs="1" maxOccurs="1" type="t_ipxe_roms"/> <xs:element name="roms" minOccurs="1" maxOccurs="1" type="t_ipxe_roms"/>