diff --git a/READMEs/README-systemd-nspawn.md b/READMEs/README-systemd-nspawn.md
index 1e54ca6..739c7f1 100644
--- a/READMEs/README-systemd-nspawn.md
+++ b/READMEs/README-systemd-nspawn.md
@@ -110,6 +110,14 @@ root@myhost:~# useradd -u883 -gnogroup sai -d/home/sai -m -r
For redhat type systems, use `-gnobody` instead
+### Specific to Debian Buster / Sid
+
+If a 32-bit install, leave out libc6-i386
+
+```
+Container # apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i386 dbus systemd-container libmbedtls-dev libev4 libev-dev libuv1 libuv1-dev libmount-dev libsqlite0-dev libgit2-dev inetutils-ping psmisc libgit2-27 libmbedcrypto3 libmbedtls12 libmbedx509-0 libmbedtls-dev libevent-2.1-6 libevent-dev libglib2.0-0 libsqlite3-0 libsqlite3-dev pkg-config libglib2.0-dev libglib2.0-0 libdbus-1-dev libdbus-1-3 g++
+```
+
### Specific to Ubuntu
We have to enable the "universe" packageset to get normal things.
@@ -137,13 +145,13 @@ Container # apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i
### Specific to Bionic
```
-apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i386 dbus systemd-container libmbedtls-dev libev4 libev-dev libuv1 libuv1-dev libmount-dev libsqlite0-dev libgit2-dev inetutils-ping psmisc libgit2-26 libmbedcrypto1 libmbedtls10 libmbedx509-0 libmbedtls-dev libevent-2.1-6 libevent-dev libglib2.0-0 libsqlite3-0 libsqlite3-dev pkg-config libglib2.0-dev libglib2.0-0 libdbus-1-dev libdbus-1-3
+Container # apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i386 dbus systemd-container libmbedtls-dev libev4 libev-dev libuv1 libuv1-dev libmount-dev libsqlite0-dev libgit2-dev inetutils-ping psmisc libgit2-26 libmbedcrypto1 libmbedtls10 libmbedx509-0 libmbedtls-dev libevent-2.1-6 libevent-dev libglib2.0-0 libsqlite3-0 libsqlite3-dev pkg-config libglib2.0-dev libglib2.0-0 libdbus-1-dev libdbus-1-3
```
### Specific to Focal
```
-apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i386 dbus systemd-container libmbedtls-dev libevent-2.1-7 libev4 libev-dev libuv1 libuv1-dev libmount-dev libsqlite0-dev libgit2-dev inetutils-ping psmisc libgit2-28 libmbedcrypto3 libmbedtls12 libmbedx509-0 libmbedtls-dev libev4 libev-dev libevent-2.1-7 libevent-dev libglib2.0-0 libsqlite3-0 libsqlite3-dev pkg-config libglib2.0-dev libglib2.0-0
+Container # apt install sudo make git gcc cmake net-tools libssl-dev vim libc6-i386 dbus systemd-container libmbedtls-dev libevent-2.1-7 libev4 libev-dev libuv1 libuv1-dev libmount-dev libsqlite0-dev libgit2-dev inetutils-ping psmisc libgit2-28 libmbedcrypto3 libmbedtls12 libmbedx509-0 libmbedtls-dev libev4 libev-dev libevent-2.1-7 libevent-dev libglib2.0-0 libsqlite3-0 libsqlite3-dev pkg-config libglib2.0-dev libglib2.0-0
```
### Specific to Fedora
@@ -243,12 +251,12 @@ will get networking services cleanly.
We will call the related NetworkManager connection `nm-...`
```
-Host # nmcli c add type ethernet autoconnect no con-name nm-ve-xenial ifname ve-xenial-amd64
-Host # nmcli c m nm-ve-xenial ipv4.method shared
-Host # nmcli c m nm-ve-xenial ipv4.addresses 192.168.80.1/24
-Host # nmcli c m nm-ve-xenial connection.zone vm
-Host # nmcli c m nm-ve-xenial connection.autoconnect true
-Host # nmcli c down nm-ve-xenial ; nmcli c up nm-ve-xenial
+Host # export NMNAME=ve-xenial ; nmcli c add type ethernet autoconnect no con-name nm-$NMNAME ifname $NMNAME ;\
+ nmcli c m nm-$NMNAME ipv4.method shared ; \
+ nmcli c m nm-$NMNAME ipv4.addresses 192.168.80.1/24 ; \
+ nmcli c m nm-$NMNAME connection.zone vm ; \
+ nmcli c m nm-$NMNAME connection.autoconnect true ; \
+ nmcli c down nm-$NMNAME ; nmcli c up nm-$NMNAME
```
## Step 6: Restart the container
@@ -313,7 +321,7 @@ Container # git clone https://libwebsockets.org/repo/libwebsockets
Container # cd libwebsockets && mkdir build && cd build && \
cmake .. -DLWS_UNIX_SOCK=1 -DLWS_WITH_STRUCT_JSON=1 \
-DLWS_WITH_STRUCT_SQLITE3=1 -DLWS_WITH_GENCRYPTO=1 -DLWS_WITH_SPAWN=1 \
- -DLWS_WITH_SECURE_STREAMS=1 -DLWS_WITH_THREADPOOL=1
+ -DLWS_WITH_SECURE_STREAMS=1 -DLWS_WITH_THREADPOOL=1 -DLWS_WITH_JOSE=1
Container # make -j && make -j install && ldconfig
```
diff --git a/assets/arch-x86-amd.svg b/assets/arch-x86-amd.svg
new file mode 100644
index 0000000..baf1a5d
--- /dev/null
+++ b/assets/arch-x86-amd.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14.423" height="14.423" viewBox="0 0 3.816 3.816" xmlns:v="https://vecta.io/nano"><circle cx="1.908" cy="1.908" r="1.908" opacity=".42" fill="#f9f9f9"/><path d="M1.285 1.4l-.607.59v1.15H1.92l.528-.572-1.155.018zM.735.784h2.327v2.36l-.594-.594V1.382H1.296z" paint-order="markers fill stroke" fill="#099b39"/><text xml:space="preserve" x="112.038" y="135.677" font-size=".723" font-family="A-OTF Shin Go Pro" letter-spacing="0" word-spacing="0" fill="#000"><tspan x="1.309" y="2.27">32</tspan></text></svg>
\ No newline at end of file
diff --git a/assets/linux-debian-buster.svg b/assets/linux-debian-buster.svg
new file mode 100644
index 0000000..2c06689
--- /dev/null
+++ b/assets/linux-debian-buster.svg
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="3.8163mm" height="3.8163mm" version="1.1" viewBox="0 0 3.8163 3.8163" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(-399.86 -577.51)">
+<g transform="translate(1050.5 701.69)">
+<circle cx="-648.7" cy="-122.27" r="1.9082" fill="#f0f0f0" opacity=".42096"/>
+<g transform="matrix(.029308 0 0 .029308 -650 -123.79)">
+<g fill="#a80030">
+<path d="m51.986 57.297c-1.797 0.025 0.34 0.926 2.686 1.287 0.648-0.506 1.236-1.018 1.76-1.516-1.461 0.358-2.948 0.366-4.446 0.229"/>
+<path d="m61.631 54.893c1.07-1.477 1.85-3.094 2.125-4.766-0.24 1.192-0.887 2.221-1.496 3.307-3.359 2.115-0.316-1.256 0-2.537-3.612 4.546-0.496 2.726-0.627 3.996"/>
+<path d="m65.191 45.629c0.217-3.236-0.637-2.213-0.924-0.978 0.335 0.174 0.6 2.281 0.924 0.978"/>
+<path d="m45.172 1.399c0.959 0.172 2.072 0.304 1.916 0.533 1.049-0.23 1.287-0.442-1.916-0.533"/>
+<path d="m47.088 1.932-0.678 0.14 0.631-0.056 0.047-0.084"/>
+<path d="m76.992 46.856c0.107 2.906-0.85 4.316-1.713 6.812l-1.553 0.776c-1.271 2.468 0.123 1.567-0.787 3.53-1.984 1.764-6.021 5.52-7.313 5.863-0.943-0.021 0.639-1.113 0.846-1.541-2.656 1.824-2.131 2.738-6.193 3.846l-0.119-0.264c-10.018 4.713-23.934-4.627-23.751-17.371-0.107 0.809-0.304 0.607-0.526 0.934-0.517-6.557 3.028-13.143 9.007-15.832 5.848-2.895 12.704-1.707 16.893 2.197-2.301-3.014-6.881-6.209-12.309-5.91-5.317 0.084-10.291 3.463-11.951 7.131-2.724 1.715-3.04 6.611-4.227 7.507-1.597 11.737 3.004 16.808 10.787 22.773 1.225 0.826 0.345 0.951 0.511 1.58-2.586-1.211-4.954-3.039-6.901-5.277 1.033 1.512 2.148 2.982 3.589 4.137-2.438-0.826-5.695-5.908-6.646-6.115 4.203 7.525 17.052 13.197 23.78 10.383-3.113 0.115-7.068 0.064-10.566-1.229-1.469-0.756-3.467-2.322-3.11-2.615 9.182 3.43 18.667 2.598 26.612-3.771 2.021-1.574 4.229-4.252 4.867-4.289-0.961 1.445 0.164 0.695-0.574 1.971 2.014-3.248-0.875-1.322 2.082-5.609l1.092 1.504c-0.406-2.696 3.348-5.97 2.967-10.234 0.861-1.304 0.961 1.403 0.047 4.403 1.268-3.328 0.334-3.863 0.66-6.609 0.352 0.923 0.814 1.904 1.051 2.878-0.826-3.216 0.848-5.416 1.262-7.285-0.408-0.181-1.275 1.422-1.473-2.377 0.029-1.65 0.459-0.865 0.625-1.271-0.324-0.186-1.174-1.451-1.691-3.877 0.375-0.57 1.002 1.478 1.512 1.562-0.328-1.929-0.893-3.4-0.916-4.88-1.49-3.114-0.527 0.415-1.736-1.337-1.586-4.947 1.316-1.148 1.512-3.396 2.404 3.483 3.775 8.881 4.404 11.117-0.48-2.726-1.256-5.367-2.203-7.922 0.73 0.307-1.176-5.609 0.949-1.691-2.27-8.352-9.715-16.156-16.564-19.818 0.838 0.767 1.896 1.73 1.516 1.881-3.406-2.028-2.807-2.186-3.295-3.043-2.775-1.129-2.957 0.091-4.795 2e-3 -5.23-2.774-6.238-2.479-11.051-4.217l0.219 1.023c-3.465-1.154-4.037 0.438-7.782 4e-3 -0.228-0.178 1.2-0.644 2.375-0.815-3.35 0.442-3.193-0.66-6.471 0.122 0.808-0.567 1.662-0.942 2.524-1.424-2.732 0.166-6.522 1.59-5.352 0.295-4.456 1.988-12.37 4.779-16.811 8.943l-0.14-0.933c-2.035 2.443-8.874 7.296-9.419 10.46l-0.544 0.127c-1.059 1.793-1.744 3.825-2.584 5.67-1.385 2.36-2.03 0.908-1.833 1.278-2.724 5.523-4.077 10.164-5.246 13.97 0.833 1.245 0.02 7.495 0.335 12.497-1.368 24.704 17.338 48.69 37.785 54.228 2.997 1.072 7.454 1.031 11.245 1.141-4.473-1.279-5.051-0.678-9.408-2.197-3.143-1.48-3.832-3.17-6.058-5.102l0.881 1.557c-4.366-1.545-2.539-1.912-6.091-3.037l0.941-1.229c-1.415-0.107-3.748-2.385-4.386-3.646l-1.548 0.061c-1.86-2.295-2.851-3.949-2.779-5.23l-0.5 0.891c-0.567-0.973-6.843-8.607-3.587-6.83-0.605-0.553-1.409-0.9-2.281-2.484l0.663-0.758c-1.567-2.016-2.884-4.6-2.784-5.461 0.836 1.129 1.416 1.34 1.99 1.533-3.957-9.818-4.179-0.541-7.176-9.994l0.634-0.051c-0.486-0.732-0.781-1.527-1.172-2.307l0.276-2.75c-2.849-3.294-0.797-14.006-0.386-19.881 0.285-2.389 2.378-4.932 3.97-8.92l-0.97-0.167c1.854-3.234 10.586-12.988 14.63-12.486 1.959-2.461-0.389-0.01-0.772-0.629 4.303-4.453 5.656-3.146 8.56-3.947 3.132-1.859-2.688 0.725-1.203-0.709 5.414-1.383 3.837-3.144 10.9-3.846 0.745 0.424-1.729 0.655-2.35 1.205 4.511-2.207 14.275-1.705 20.617 1.225 7.359 3.439 15.627 13.605 15.953 23.17l0.371 0.1c-0.188 3.802 0.582 8.199-0.752 12.238l0.908-1.912"/>
+<path d="m32.372 59.764-0.252 1.26c1.181 1.604 2.118 3.342 3.626 4.596-1.085-2.118-1.891-2.993-3.374-5.856"/>
+<path d="m35.164 59.654c-0.625-0.691-0.995-1.523-1.409-2.352 0.396 1.457 1.207 2.709 1.962 3.982l-0.553-1.63"/>
+<path d="m84.568 48.916-0.264 0.662c-0.484 3.438-1.529 6.84-3.131 9.994 1.77-3.328 2.915-6.968 3.395-10.656"/>
+<path d="m45.527 0.537c1.215-0.445 2.987-0.244 4.276-0.537-1.68 0.141-3.352 0.225-5.003 0.438l0.727 0.099"/>
+<path d="m2.872 23.219c0.28 2.592-1.95 3.598 0.494 1.889 1.31-2.951-0.512-0.815-0.494-1.889"/>
+<path d="m0 35.215c0.563-1.728 0.665-2.766 0.88-3.766-1.556 1.989-0.716 2.413-0.88 3.766"/>
+</g>
+</g>
+</g>
+<text x="401.664" y="580.84" fill="#000000" font-family="'A-OTF Shin Go Pro'" font-size="1.0186px" letter-spacing="0px" stroke-width=".038197" word-spacing="0px" style="line-height:1.25;text-decoration-color:#000000;text-decoration-line:none" xml:space="preserve"><tspan x="401.664" y="580.84" stroke-width=".038197">10</tspan></text>
+</g>
+</svg>
diff --git a/assets/linux-debian-sid.svg b/assets/linux-debian-sid.svg
new file mode 100644
index 0000000..b327508
--- /dev/null
+++ b/assets/linux-debian-sid.svg
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="3.8163mm" height="3.8163mm" version="1.1" viewBox="0 0 3.8163 3.8163" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+<metadata>
+<rdf:RDF>
+<cc:Work rdf:about="">
+<dc:format>image/svg+xml</dc:format>
+<dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+<dc:title/>
+</cc:Work>
+</rdf:RDF>
+</metadata>
+<g transform="translate(111.52 183.34)">
+<g transform="translate(841.47 545.61)">
+<circle cx="-648.7" cy="-122.27" r="1.9082" fill="#f0f0f0" opacity=".42096"/>
+<g transform="matrix(.029308 0 0 .029308 -650 -123.79)">
+<g fill="#a80030">
+<path d="m51.986 57.297c-1.797 0.025 0.34 0.926 2.686 1.287 0.648-0.506 1.236-1.018 1.76-1.516-1.461 0.358-2.948 0.366-4.446 0.229"/>
+<path d="m61.631 54.893c1.07-1.477 1.85-3.094 2.125-4.766-0.24 1.192-0.887 2.221-1.496 3.307-3.359 2.115-0.316-1.256 0-2.537-3.612 4.546-0.496 2.726-0.627 3.996"/>
+<path d="m65.191 45.629c0.217-3.236-0.637-2.213-0.924-0.978 0.335 0.174 0.6 2.281 0.924 0.978"/>
+<path d="m45.172 1.399c0.959 0.172 2.072 0.304 1.916 0.533 1.049-0.23 1.287-0.442-1.916-0.533"/>
+<path d="m47.088 1.932-0.678 0.14 0.631-0.056 0.047-0.084"/>
+<path d="m76.992 46.856c0.107 2.906-0.85 4.316-1.713 6.812l-1.553 0.776c-1.271 2.468 0.123 1.567-0.787 3.53-1.984 1.764-6.021 5.52-7.313 5.863-0.943-0.021 0.639-1.113 0.846-1.541-2.656 1.824-2.131 2.738-6.193 3.846l-0.119-0.264c-10.018 4.713-23.934-4.627-23.751-17.371-0.107 0.809-0.304 0.607-0.526 0.934-0.517-6.557 3.028-13.143 9.007-15.832 5.848-2.895 12.704-1.707 16.893 2.197-2.301-3.014-6.881-6.209-12.309-5.91-5.317 0.084-10.291 3.463-11.951 7.131-2.724 1.715-3.04 6.611-4.227 7.507-1.597 11.737 3.004 16.808 10.787 22.773 1.225 0.826 0.345 0.951 0.511 1.58-2.586-1.211-4.954-3.039-6.901-5.277 1.033 1.512 2.148 2.982 3.589 4.137-2.438-0.826-5.695-5.908-6.646-6.115 4.203 7.525 17.052 13.197 23.78 10.383-3.113 0.115-7.068 0.064-10.566-1.229-1.469-0.756-3.467-2.322-3.11-2.615 9.182 3.43 18.667 2.598 26.612-3.771 2.021-1.574 4.229-4.252 4.867-4.289-0.961 1.445 0.164 0.695-0.574 1.971 2.014-3.248-0.875-1.322 2.082-5.609l1.092 1.504c-0.406-2.696 3.348-5.97 2.967-10.234 0.861-1.304 0.961 1.403 0.047 4.403 1.268-3.328 0.334-3.863 0.66-6.609 0.352 0.923 0.814 1.904 1.051 2.878-0.826-3.216 0.848-5.416 1.262-7.285-0.408-0.181-1.275 1.422-1.473-2.377 0.029-1.65 0.459-0.865 0.625-1.271-0.324-0.186-1.174-1.451-1.691-3.877 0.375-0.57 1.002 1.478 1.512 1.562-0.328-1.929-0.893-3.4-0.916-4.88-1.49-3.114-0.527 0.415-1.736-1.337-1.586-4.947 1.316-1.148 1.512-3.396 2.404 3.483 3.775 8.881 4.404 11.117-0.48-2.726-1.256-5.367-2.203-7.922 0.73 0.307-1.176-5.609 0.949-1.691-2.27-8.352-9.715-16.156-16.564-19.818 0.838 0.767 1.896 1.73 1.516 1.881-3.406-2.028-2.807-2.186-3.295-3.043-2.775-1.129-2.957 0.091-4.795 2e-3 -5.23-2.774-6.238-2.479-11.051-4.217l0.219 1.023c-3.465-1.154-4.037 0.438-7.782 4e-3 -0.228-0.178 1.2-0.644 2.375-0.815-3.35 0.442-3.193-0.66-6.471 0.122 0.808-0.567 1.662-0.942 2.524-1.424-2.732 0.166-6.522 1.59-5.352 0.295-4.456 1.988-12.37 4.779-16.811 8.943l-0.14-0.933c-2.035 2.443-8.874 7.296-9.419 10.46l-0.544 0.127c-1.059 1.793-1.744 3.825-2.584 5.67-1.385 2.36-2.03 0.908-1.833 1.278-2.724 5.523-4.077 10.164-5.246 13.97 0.833 1.245 0.02 7.495 0.335 12.497-1.368 24.704 17.338 48.69 37.785 54.228 2.997 1.072 7.454 1.031 11.245 1.141-4.473-1.279-5.051-0.678-9.408-2.197-3.143-1.48-3.832-3.17-6.058-5.102l0.881 1.557c-4.366-1.545-2.539-1.912-6.091-3.037l0.941-1.229c-1.415-0.107-3.748-2.385-4.386-3.646l-1.548 0.061c-1.86-2.295-2.851-3.949-2.779-5.23l-0.5 0.891c-0.567-0.973-6.843-8.607-3.587-6.83-0.605-0.553-1.409-0.9-2.281-2.484l0.663-0.758c-1.567-2.016-2.884-4.6-2.784-5.461 0.836 1.129 1.416 1.34 1.99 1.533-3.957-9.818-4.179-0.541-7.176-9.994l0.634-0.051c-0.486-0.732-0.781-1.527-1.172-2.307l0.276-2.75c-2.849-3.294-0.797-14.006-0.386-19.881 0.285-2.389 2.378-4.932 3.97-8.92l-0.97-0.167c1.854-3.234 10.586-12.988 14.63-12.486 1.959-2.461-0.389-0.01-0.772-0.629 4.303-4.453 5.656-3.146 8.56-3.947 3.132-1.859-2.688 0.725-1.203-0.709 5.414-1.383 3.837-3.144 10.9-3.846 0.745 0.424-1.729 0.655-2.35 1.205 4.511-2.207 14.275-1.705 20.617 1.225 7.359 3.439 15.627 13.605 15.953 23.17l0.371 0.1c-0.188 3.802 0.582 8.199-0.752 12.238l0.908-1.912"/>
+<path d="m32.372 59.764-0.252 1.26c1.181 1.604 2.118 3.342 3.626 4.596-1.085-2.118-1.891-2.993-3.374-5.856"/>
+<path d="m35.164 59.654c-0.625-0.691-0.995-1.523-1.409-2.352 0.396 1.457 1.207 2.709 1.962 3.982l-0.553-1.63"/>
+<path d="m84.568 48.916-0.264 0.662c-0.484 3.438-1.529 6.84-3.131 9.994 1.77-3.328 2.915-6.968 3.395-10.656"/>
+<path d="m45.527 0.537c1.215-0.445 2.987-0.244 4.276-0.537-1.68 0.141-3.352 0.225-5.003 0.438l0.727 0.099"/>
+<path d="m2.872 23.219c0.28 2.592-1.95 3.598 0.494 1.889 1.31-2.951-0.512-0.815-0.494-1.889"/>
+<path d="m0 35.215c0.563-1.728 0.665-2.766 0.88-3.766-1.556 1.989-0.716 2.413-0.88 3.766"/>
+</g>
+</g>
+</g>
+<g transform="translate(539.08 -59.156)">
+<circle cx="-648.7" cy="-122.27" r="1.9082" fill="#f0f0f0" opacity=".42096"/>
+<g transform="matrix(.029308 0 0 .029308 -650 -123.79)">
+<g fill="#a80030">
+<path d="m51.986 57.297c-1.797 0.025 0.34 0.926 2.686 1.287 0.648-0.506 1.236-1.018 1.76-1.516-1.461 0.358-2.948 0.366-4.446 0.229"/>
+<path d="m61.631 54.893c1.07-1.477 1.85-3.094 2.125-4.766-0.24 1.192-0.887 2.221-1.496 3.307-3.359 2.115-0.316-1.256 0-2.537-3.612 4.546-0.496 2.726-0.627 3.996"/>
+<path d="m65.191 45.629c0.217-3.236-0.637-2.213-0.924-0.978 0.335 0.174 0.6 2.281 0.924 0.978"/>
+<path d="m45.172 1.399c0.959 0.172 2.072 0.304 1.916 0.533 1.049-0.23 1.287-0.442-1.916-0.533"/>
+<path d="m47.088 1.932-0.678 0.14 0.631-0.056 0.047-0.084"/>
+<path d="m76.992 46.856c0.107 2.906-0.85 4.316-1.713 6.812l-1.553 0.776c-1.271 2.468 0.123 1.567-0.787 3.53-1.984 1.764-6.021 5.52-7.313 5.863-0.943-0.021 0.639-1.113 0.846-1.541-2.656 1.824-2.131 2.738-6.193 3.846l-0.119-0.264c-10.018 4.713-23.934-4.627-23.751-17.371-0.107 0.809-0.304 0.607-0.526 0.934-0.517-6.557 3.028-13.143 9.007-15.832 5.848-2.895 12.704-1.707 16.893 2.197-2.301-3.014-6.881-6.209-12.309-5.91-5.317 0.084-10.291 3.463-11.951 7.131-2.724 1.715-3.04 6.611-4.227 7.507-1.597 11.737 3.004 16.808 10.787 22.773 1.225 0.826 0.345 0.951 0.511 1.58-2.586-1.211-4.954-3.039-6.901-5.277 1.033 1.512 2.148 2.982 3.589 4.137-2.438-0.826-5.695-5.908-6.646-6.115 4.203 7.525 17.052 13.197 23.78 10.383-3.113 0.115-7.068 0.064-10.566-1.229-1.469-0.756-3.467-2.322-3.11-2.615 9.182 3.43 18.667 2.598 26.612-3.771 2.021-1.574 4.229-4.252 4.867-4.289-0.961 1.445 0.164 0.695-0.574 1.971 2.014-3.248-0.875-1.322 2.082-5.609l1.092 1.504c-0.406-2.696 3.348-5.97 2.967-10.234 0.861-1.304 0.961 1.403 0.047 4.403 1.268-3.328 0.334-3.863 0.66-6.609 0.352 0.923 0.814 1.904 1.051 2.878-0.826-3.216 0.848-5.416 1.262-7.285-0.408-0.181-1.275 1.422-1.473-2.377 0.029-1.65 0.459-0.865 0.625-1.271-0.324-0.186-1.174-1.451-1.691-3.877 0.375-0.57 1.002 1.478 1.512 1.562-0.328-1.929-0.893-3.4-0.916-4.88-1.49-3.114-0.527 0.415-1.736-1.337-1.586-4.947 1.316-1.148 1.512-3.396 2.404 3.483 3.775 8.881 4.404 11.117-0.48-2.726-1.256-5.367-2.203-7.922 0.73 0.307-1.176-5.609 0.949-1.691-2.27-8.352-9.715-16.156-16.564-19.818 0.838 0.767 1.896 1.73 1.516 1.881-3.406-2.028-2.807-2.186-3.295-3.043-2.775-1.129-2.957 0.091-4.795 2e-3 -5.23-2.774-6.238-2.479-11.051-4.217l0.219 1.023c-3.465-1.154-4.037 0.438-7.782 4e-3 -0.228-0.178 1.2-0.644 2.375-0.815-3.35 0.442-3.193-0.66-6.471 0.122 0.808-0.567 1.662-0.942 2.524-1.424-2.732 0.166-6.522 1.59-5.352 0.295-4.456 1.988-12.37 4.779-16.811 8.943l-0.14-0.933c-2.035 2.443-8.874 7.296-9.419 10.46l-0.544 0.127c-1.059 1.793-1.744 3.825-2.584 5.67-1.385 2.36-2.03 0.908-1.833 1.278-2.724 5.523-4.077 10.164-5.246 13.97 0.833 1.245 0.02 7.495 0.335 12.497-1.368 24.704 17.338 48.69 37.785 54.228 2.997 1.072 7.454 1.031 11.245 1.141-4.473-1.279-5.051-0.678-9.408-2.197-3.143-1.48-3.832-3.17-6.058-5.102l0.881 1.557c-4.366-1.545-2.539-1.912-6.091-3.037l0.941-1.229c-1.415-0.107-3.748-2.385-4.386-3.646l-1.548 0.061c-1.86-2.295-2.851-3.949-2.779-5.23l-0.5 0.891c-0.567-0.973-6.843-8.607-3.587-6.83-0.605-0.553-1.409-0.9-2.281-2.484l0.663-0.758c-1.567-2.016-2.884-4.6-2.784-5.461 0.836 1.129 1.416 1.34 1.99 1.533-3.957-9.818-4.179-0.541-7.176-9.994l0.634-0.051c-0.486-0.732-0.781-1.527-1.172-2.307l0.276-2.75c-2.849-3.294-0.797-14.006-0.386-19.881 0.285-2.389 2.378-4.932 3.97-8.92l-0.97-0.167c1.854-3.234 10.586-12.988 14.63-12.486 1.959-2.461-0.389-0.01-0.772-0.629 4.303-4.453 5.656-3.146 8.56-3.947 3.132-1.859-2.688 0.725-1.203-0.709 5.414-1.383 3.837-3.144 10.9-3.846 0.745 0.424-1.729 0.655-2.35 1.205 4.511-2.207 14.275-1.705 20.617 1.225 7.359 3.439 15.627 13.605 15.953 23.17l0.371 0.1c-0.188 3.802 0.582 8.199-0.752 12.238l0.908-1.912"/>
+<path d="m32.372 59.764-0.252 1.26c1.181 1.604 2.118 3.342 3.626 4.596-1.085-2.118-1.891-2.993-3.374-5.856"/>
+<path d="m35.164 59.654c-0.625-0.691-0.995-1.523-1.409-2.352 0.396 1.457 1.207 2.709 1.962 3.982l-0.553-1.63"/>
+<path d="m84.568 48.916-0.264 0.662c-0.484 3.438-1.529 6.84-3.131 9.994 1.77-3.328 2.915-6.968 3.395-10.656"/>
+<path d="m45.527 0.537c1.215-0.445 2.987-0.244 4.276-0.537-1.68 0.141-3.352 0.225-5.003 0.438l0.727 0.099"/>
+<path d="m2.872 23.219c0.28 2.592-1.95 3.598 0.494 1.889 1.31-2.951-0.512-0.815-0.494-1.889"/>
+<path d="m0 35.215c0.563-1.728 0.665-2.766 0.88-3.766-1.556 1.989-0.716 2.413-0.88 3.766"/>
+</g>
+</g>
+</g>
+<text x="-110.045" y="-179.886" fill="#000000" font-family="'A-OTF Shin Go Pro'" font-size="1.1577px" letter-spacing="0px" stroke-width=".043412" word-spacing="0px" style="line-height:1.25;text-decoration-color:#000000;text-decoration-line:none" xml:space="preserve"><tspan x="-110.045" y="-179.886" stroke-width=".043412">sid</tspan></text>
+</g>
+</svg>
diff --git a/assets/linux-debian-sid32.svg b/assets/linux-debian-sid32.svg
new file mode 100644
index 0000000..d55bc71
--- /dev/null
+++ b/assets/linux-debian-sid32.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="14.423" height="14.423" viewBox="0 0 3.816 3.816" xmlns:v="https://vecta.io/nano"><circle cy="1.908" cx="1.908" r="1.908" opacity=".42" fill="#f0f0f0"/><g fill="#a80030"><path d="M2.127 2.068c-.053.001.01.027.08.038l.052-.044c-.043.01-.086.01-.13.007"/><path d="M2.41 1.998c.03-.043.054-.09.062-.14-.007.035-.026.065-.044.097-.098.062-.01-.037 0-.074-.106.133-.015.08-.018.117m.104-.272c.006-.095-.02-.065-.027-.03.01.005.018.067.027.03M1.927.43c.028.005.06.01.056.016.03-.007.038-.013-.056-.016"/><path d="M1.983.446l-.02.004.018-.002.001-.002"/><path d="M2.86 1.762c.003.085-.025.126-.05.2l-.046.023c-.037.072.004.046-.023.103-.058.052-.176.162-.214.172-.028-.001.02-.033.025-.045-.078.053-.062.08-.182.113l-.003-.008c-.294.138-.7-.136-.696-.51-.003.024-.01.018-.015.027a.47.47 0 0 1 .264-.464c.17-.085.372-.05.495.064-.067-.088-.202-.182-.36-.173-.156.002-.302.1-.35.21-.08.05-.09.194-.124.22-.047.344.088.493.316.667.036.024.01.028.015.046a.62.62 0 0 1-.202-.155c.03.044.063.087.105.12-.07-.024-.167-.173-.195-.18.123.22.5.387.697.304-.09.003-.207.002-.31-.036-.043-.022-.102-.068-.09-.077.27.1.547.076.78-.11.06-.046.124-.125.143-.126-.028.042.005.02-.017.058.06-.095-.026-.04.06-.164l.032.044c-.012-.08.098-.175.087-.3.025-.038.028.04.001.13.037-.098.01-.113.02-.194.01.027.024.056.03.084-.024-.094.025-.16.037-.214-.012-.005-.037.042-.043-.07.001-.048.013-.025.018-.037-.01-.005-.034-.043-.05-.114.01-.017.03.043.044.046-.01-.057-.026-.1-.027-.143-.044-.09-.015.012-.05-.04-.046-.145.04-.034.044-.1.07.102.11.26.13.326-.014-.08-.037-.157-.065-.232.02.01-.034-.164.028-.05C3.05.937 2.833.71 2.632.6c.025.022.056.05.044.055-.1-.06-.082-.064-.097-.09-.08-.033-.087.003-.14 0-.153-.08-.183-.073-.324-.124l.006.03c-.102-.034-.118.013-.228 0-.007-.005.035-.02.07-.024-.098.013-.094-.02-.19.004.024-.017.05-.028.074-.042-.08.005-.19.047-.157.01-.13.058-.363.14-.493.262L1.194.655C1.134.727.934.87.918.962L.902.965c-.03.053-.05.112-.076.166-.04.07-.06.027-.054.037-.08.162-.12.298-.154.41.024.036.001.22.01.366-.04.724.508 1.427 1.107 1.59.088.03.218.03.33.033-.13-.037-.148-.02-.276-.064-.092-.043-.112-.093-.178-.15l.026.046c-.128-.045-.074-.056-.18-.09l.028-.036c-.04-.003-.11-.07-.13-.107l-.045.002c-.055-.067-.084-.116-.08-.153l-.015.026c-.017-.03-.2-.252-.105-.2-.018-.016-.04-.026-.067-.073l.02-.022c-.046-.06-.085-.135-.082-.16.025.033.042.04.058.045C.925 2.344.92 2.616.83 2.34l.02-.001c-.014-.02-.023-.045-.034-.068l.008-.08C.74 2.092.8 1.778.812 1.606c.008-.07.07-.145.116-.26L.9 1.34c.054-.095.31-.38.43-.366.057-.072-.01 0-.023-.018.126-.13.166-.092.25-.116.092-.054-.08.02-.035-.02.16-.04.112-.092.32-.113.022.012-.05.02-.07.035.132-.065.418-.05.604.036.216.1.458.4.468.68l.01.003c-.006.11.017.24-.022.36l.027-.056"/><path d="M1.552 2.14l-.007.037c.035.047.062.098.106.135l-.1-.172m.083-.003c-.018-.02-.03-.045-.04-.07.012.043.035.08.058.117l-.016-.048m1.446-.313l-.008.02a.94.94 0 0 1-.092.293.92.92 0 0 0 .1-.312M1.937.405c.036-.013.088-.007.125-.016l-.147.013.02.003M.687 1.07c.008.076-.057.105.014.055C.74 1.038.687 1.1.687 1.07m-.084.35c.017-.05.02-.08.026-.11-.046.058-.02.07-.026.11"/></g><text xml:space="preserve" x="181.751" y="384.811" font-size="1.158" font-family="A-OTF Shin Go Pro" letter-spacing="0" word-spacing="0" fill="#000"><tspan x="1.474" y="3.451">sid</tspan></text><text xml:space="preserve" x="181.283" y="383.495" font-size=".902" font-family="A-OTF Shin Go Pro" letter-spacing="0" word-spacing="0" fill="#000"><tspan x="1.006" y="2.135">32</tspan></text></svg>
\ No newline at end of file
diff --git a/assets/tc-noptmsvc.svg b/assets/tc-noptmsvc.svg
new file mode 100644
index 0000000..dd47f12
--- /dev/null
+++ b/assets/tc-noptmsvc.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 3.816 3.816" height="14.423" width="14.423" xmlns:v="https://vecta.io/nano"><circle r="1.908" cy="1.908" cx="1.908" opacity=".12" fill="#f9f9f9"/><path d="M2.382 3.194c-.03-.01-.154-.14-.475-.495l-.448-.48c-.007 0-.14.104-.297.232-.33.27-.3.258-.483.183-.172-.07-.156-.002-.16-.713s-.01-.663.115-.724c.217-.105.192-.113.533.166l.29.23c.005 0 .208-.218.45-.485.456-.502.467-.512.553-.512.028 0 .61.275.64.303.056.05.055.024.055 1.01 0 1.113.032.967-.244 1.102-.407.198-.45.213-.53.183zm.117-1.3l-.01-.524a19.92 19.92 0 0 0-.634.52c-.014.017-.012.023.018.047l.322.262.296.23c.005-.003.01-.243.01-.534zm-1.4.1a.56.56 0 0 0 .075-.095 2.9 2.9 0 0 0-.298-.326c-.015 0-.026.556-.012.627l.008.04.076-.082.15-.166z" fill="#b88aed"/><path d="M2.312 3.12l-.395-.43-.387-.426-.07-.074-.268.22c-.37.305-.33.29-.502.214-.18-.078-.163.002-.162-.714s-.014-.64.142-.707c.188-.08.163-.088.407.11l.265.216.112.086c.006 0 .453-.485.792-.86.11-.12.14-.14.188-.13.058.015.063.046.063.394v.32l-.336.276-.34.288c-.004.013.003.02.407.347l.273.227c.015.022.01.635-.004.668-.012.026-.062.054-.095.054-.006 0-.046-.036-.09-.08zM1.036 2.084l.16-.186a3.42 3.42 0 0 0-.331-.359c-.015 0-.03.67-.015.706.01.028.026.014.186-.162zM2.485 3.19c.008-.003.02-.003.022.001-.03.006-.032.003-.022-.001zm.66-.39zm0-.035z" fill="#9260cc"/><path d="M.708 2.62c-.202-.083-.18.002-.18-.72l.012-.607c.012-.055.084-.012.186.1l.107.116.004.174.006.39c.001.26-.013.256.183.045.175-.19.175-.19.22-.136l.11.12c.04.044.075.084.075.09s-.214.188-.495.415c-.083.067-.1.068-.227.016zm1.043-.795c-.067-.058-.07-.064-.043-.078.053-.027.14-.025.175.003l.034.028-.046.048c-.057.058-.05.058-.12-.001zm.187-.087c-.012-.013-.01-.017.018-.024.062-.015.18-.114.195-.164.007-.024.078-.037.078-.015 0 .013-.042.034-.05.025a1.37 1.37 0 0 1-.207.184c-.01.006-.023.003-.032-.007zm-.315-.112c.013-.001.02.006.02.008 0 .01-.01.005-.02-.008zm-.122-.02c0-.006.005-.015.012-.02.012.01.006.02 0 .023zm.522-.001c.004-.006.012-.012.018-.012.01.018.003.023-.007.023zm-.432-.1c.012-.016.026-.03.032-.03s-.001.013-.017.03c-.035.037-.042.038-.015 0zm.666-.018c.004-.006.013-.012.02-.012 0 .018-.008.023-.014.023zm.055-.036c.003-.008.012-.018.02-.02.008.02-.002.028-.01.03zm-.636-.04zm.035-.035z" fill="#6e40a4"/></svg>
diff --git a/cmake/sai_config_private.h.in b/cmake/sai_config_private.h.in
new file mode 100644
index 0000000..4cb0c69
--- /dev/null
+++ b/cmake/sai_config_private.h.in
@@ -0,0 +1 @@
+%cmakedefine LIBGIT2_HAVE_GIT_PROXY_OPTIONS_INIT
diff --git a/scripts/builder-conf b/scripts/builder-conf
index eea8f3c..ae69ffc 100644
--- a/scripts/builder-conf
+++ b/scripts/builder-conf
@@ -8,7 +8,7 @@
"platforms": [
{
- "name": "linux-ubuntu-xenial-amd64",
+ "name": "linux-debian-buster/x86_64-amd/gcc",
"instances": 1,
"masters": [ "wss://warmcat.com/sai/builder" ]
}
diff --git a/src/builder/CMakeLists.txt b/src/builder/CMakeLists.txt
index 62d9b30..f8cfae0 100644
--- a/src/builder/CMakeLists.txt
+++ b/src/builder/CMakeLists.txt
@@ -55,7 +55,25 @@ if (requirements)
if (SAI_HAVE_LIBGIT2_GIT_ERROR)
set(CMAKE_C_FLAGS "-DSAI_HAVE_LIBGIT2_GIT_ERROR ${CMAKE_C_FLAGS}")
endif()
-
+
+ CHECK_C_SOURCE_COMPILES("
+ #include <git2.h>
+ int main(int argc, char **argv) {
+ git_proxy_options o;
+ git_proxy_options_init(&o, GIT_PROXY_OPTIONS_VERSION);
+ return 0;
+ }" LIBGIT2_HAVE_GIT_PROXY_OPTIONS_INIT)
+
+ if (LIBGIT2_HAVE_GIT_PROXY_OPTIONS_INIT)
+ set(CMAKE_C_FLAGS "-DLIBGIT2_HAVE_GIT_PROXY_OPTIONS_INIT ${CMAKE_C_FLAGS}")
+ endif()
+
+ #configure_file("${PROJECT_SOURCE_DIR}/cmake/sai_config_private.h.in"
+ # "${PROJECT_BINARY_DIR}/sai_config_private.h")
+ #
+ #target_include_directories("sai-builder" PRIVATE "${PROJECT_BINARY_DIR}")
+
+
if (SAI_LWS_INC_PATH)
target_include_directories("sai-builder" PRIVATE ${SAI_LWS_INC_PATH})
diff --git a/src/builder/b-mirror.c b/src/builder/b-mirror.c
index b2ce43e..02c0df7 100644
--- a/src/builder/b-mirror.c
+++ b/src/builder/b-mirror.c
@@ -137,6 +137,10 @@ sai_mirror_local_checkout(struct sai_nspawn *ns)
* This may take an open-ended amount of time
*/
+#if defined(LIBGIT2_HAVE_GIT_PROXY_OPTIONS_INIT)
+ git_proxy_options_init(&opts.proxy_opts, GIT_PROXY_OPTIONS_VERSION);
+#endif
+
n = git_remote_fetch(remote, &rfs, &opts, "fetch");
git_remote_free(remote);
if (n) {
diff --git a/src/builder/b-nspawn.c b/src/builder/b-nspawn.c
index 308c7a2..e55542e 100644
--- a/src/builder/b-nspawn.c
+++ b/src/builder/b-nspawn.c
@@ -300,7 +300,7 @@ saib_spawn(struct sai_nspawn *ns)
memset(&info, 0, sizeof(info));
info.vh = builder.vhost;
- info.env_array = env;
+ info.env_array = (const char **)env;
info.exec_array = cmd;
info.protocol_name = "sai-stdxxx";
info.max_log_lines = 10000;
diff --git a/src/common/include/private.h b/src/common/include/private.h
index f4ec979..09e1ff7 100644
--- a/src/common/include/private.h
+++ b/src/common/include/private.h
@@ -21,6 +21,8 @@
* structs common to builder and master
*/
+//#include <sai_config_private.h>
+
#if defined(__linux__)
#define UDS_PATHNAME_LOGPROXY "@com.warmcat.com.saib.logproxy"
#else
![[]](/git/avatar/c50933ca2aa61e0fe2c43d46bb6b59cb_avatar){kind=avatar}
Andy Green <andy@warmcat.com> 2020-10-26 06:56 UTC