update docs

examples/software/cartridge.toml

@@ -1,11 +1,11 @@
-format = 1
+format = 2
 id = "demo.tools"
 name = "Hello and system report"
 version = "1.0"
 
 # Paths are relative to this recipe. Each payload entry creates one partition.
 [[payload]]
-bundles = ["../../out/demo-hello"]
+sources = ["hello/software.toml"]
 
 [[payload]]
-bundles = ["../../out/demo-report"]
+sources = ["report/software.toml"]

examples/software/hello/software.toml

@@ -1,14 +1,12 @@
-format = 1
+format = 2
 id = "demo.hello"
 name = "AArch64 hello"
 version = "1.0"
-architecture = "aarch64"
-root = "root"
 
 [commands]
-hello = "bin/hello"
+hello = "usr/bin/hello"
 
-# This trusted command runs only on the workstation. It is never put on media.
-[build]
-directory = "."
-command = ["sh", "-eu", "-c", "mkdir -p root/bin; aarch64-linux-gnu-gcc -O2 hello.c -o root/bin/hello"]
+# Void source templates run only on the workstation.
+[source]
+package = "fds-demo-hello"
+template = "void"

examples/software/hello/void/template

@@ -0,0 +1,15 @@
+# Small example of a native Void source package, cross-built by xbps-src.
+pkgname=fds-demo-hello
+version=1.0
+revision=1
+archs="aarch64"
+short_desc="FDS cartridge hello example"
+maintainer="FDS/OS maintainers"
+license="MIT"
+homepage="https://docs.voidlinux.org/xbps/"
+do_build() {
+	${CC} ${CFLAGS} "${FILESDIR}/hello.c" ${LDFLAGS} -o hello
+}
+do_install() {
+	vbin hello
+}

examples/software/report/software.toml

@@ -1,9 +1,11 @@
-format = 1
+format = 2
 id = "demo.report"
 name = "System report"
 version = "1.0"
-architecture = "any"
-root = "root"
 
 [commands]
-report = "bin/report"
+report = "usr/bin/report"
+
+[source]
+package = "fds-demo-report"
+template = "void"

examples/software/report/void/files/report

@@ -2,3 +2,4 @@
 printf 'FDS cartridge system report\n'
 uname -m
 id
+[ "${1-}" != hold ] || exec tail -f /dev/null

examples/software/report/void/template

@@ -0,0 +1,12 @@
+pkgname=fds-demo-report
+version=1.0
+revision=1
+archs="aarch64"
+depends="bash coreutils"
+short_desc="FDS cartridge report example"
+maintainer="FDS/OS maintainers"
+license="MIT"
+homepage="https://docs.voidlinux.org/xbps/"
+do_install() {
+	vbin "${FILESDIR}/report"
+}