fix(payload): port raw external.img container

steps/improve/import_payload.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# SPDX-FileCopyrightText: 2026 live-bootstrap contributors
+# SPDX-License-Identifier: MIT
+
+set -ex
+
+if [ "${PAYLOAD_REQUIRED}" = True ]; then
+    mkdir -p /external/distfiles
+    found_payload=0
+    mkdir -p /dev
+
+    if [ ! -r /proc/partitions ]; then
+        payload-import --mount-proc >/dev/null 2>&1 || :
+    fi
+
+    if [ ! -r /proc/partitions ]; then
+        echo "payload-import failed: /proc/partitions is unavailable." >&2
+        exit 1
+    fi
+
+    while read -r major minor blocks name; do
+        case "${major}" in
+            ""|major|*[!0-9]*)
+                continue
+                ;;
+        esac
+        case "${minor}" in
+            ""|minor|*[!0-9]*)
+                continue
+                ;;
+        esac
+
+        dev_path="/dev/lbpayload-${major}-${minor}"
+        [ -b "${dev_path}" ] || mknod -m 600 "${dev_path}" b "${major}" "${minor}" >/dev/null 2>&1 || :
+
+        if payload-import --probe "${dev_path}" >/dev/null 2>&1; then
+            payload-import --device "${dev_path}" /external/distfiles
+            found_payload=1
+            break
+        fi
+    done < /proc/partitions
+
+    if [ "${found_payload}" != 1 ]; then
+        echo "payload-import failed: no payload image found in /proc/partitions devices." >&2
+        exit 1
+    fi
+fi

steps/manifest

@@ -40,6 +40,7 @@ define: BUILD_FIWIX = ( KERNEL_BOOTSTRAP == True || BUILD_KERNELS == True )
 build: fiwix-1.5.0-lb1 ( BUILD_FIWIX == True )
 build: lwext4-1.0.0-lb1 ( BUILD_FIWIX == True )
 build: kexec-fiwix-1.0 ( BUILD_FIWIX == True )
+build: payload-import-1.0 ( KERNEL_BOOTSTRAP == True )
 jump: fiwix ( KERNEL_BOOTSTRAP == True )
 improve: reconfigure ( CONFIGURATOR != True )
 define: JOBS = 1 ( KERNEL_BOOTSTRAP == True )
@@ -132,6 +133,7 @@ jump: break ( INTERNAL_CI == pass1 )
 improve: populate_device_nodes
 jump: linux ( CHROOT == False )
 jump: move_disk ( KERNEL_BOOTSTRAP == True )
+improve: import_payload ( KERNEL_BOOTSTRAP == True )
 improve: finalize_job_count
 improve: finalize_fhs
 improve: open_console ( CONSOLES == True )

steps/payload-import-1.0/pass1.kaem

@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# SPDX-FileCopyrightText: 2026 live-bootstrap contributors
+# SPDX-License-Identifier: MIT
+
+set -ex
+
+cd src
+tcc -m32 -march=i386 -std=c89 -static -I../../tcc/tcc-0.9.27/include -o ${BINDIR}/payload-import payload-import.c
+cd ..
+
+if match x${UPDATE_CHECKSUMS} xTrue; then
+    sha256sum -o ${pkg}.checksums \
+        /usr/bin/payload-import
+
+    cp ${pkg}.checksums ${SRCDIR}
+fi

steps/payload-import-1.0/src/payload-import.c

@@ -0,0 +1,353 @@
+/* SPDX-FileCopyrightText: 2026 live-bootstrap contributors */
+/* SPDX-License-Identifier: MIT */
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#define MAGIC "LBPAYLD1"
+#define MAGIC_LEN 8
+#define MAX_NAME_LEN 1024
+#define COPY_BUFSZ 65536
+#define SYS_MOUNT 21
+
+static unsigned long long read_u64le(const unsigned char *buf)
+{
+	return (unsigned long long)buf[0]
+		| ((unsigned long long)buf[1] << 8)
+		| ((unsigned long long)buf[2] << 16)
+		| ((unsigned long long)buf[3] << 24)
+		| ((unsigned long long)buf[4] << 32)
+		| ((unsigned long long)buf[5] << 40)
+		| ((unsigned long long)buf[6] << 48)
+		| ((unsigned long long)buf[7] << 56);
+}
+
+static int read_exact(FILE *in, void *buf, size_t len)
+{
+	size_t got = 0;
+	unsigned char *out = (unsigned char *)buf;
+
+	while (got < len) {
+		size_t n = fread(out + got, 1, len - got, in);
+		if (n == 0) {
+			return -1;
+		}
+		got += n;
+	}
+	return 0;
+}
+
+static int copy_exact(FILE *in, FILE *out, unsigned long long len,
+	const char *device, const char *name, const char *out_path)
+{
+	unsigned char *buf;
+	unsigned long long remaining = len;
+
+	buf = (unsigned char *)malloc(COPY_BUFSZ);
+	if (buf == NULL) {
+		fputs("payload-import: out of memory\n", stderr);
+		return 1;
+	}
+
+	while (remaining > 0) {
+		size_t chunk = (size_t)COPY_BUFSZ;
+		unsigned long long copied = len - remaining;
+		size_t nread;
+		size_t written;
+		if (remaining < (unsigned long long)COPY_BUFSZ) {
+			chunk = (size_t)remaining;
+		}
+		nread = fread(buf, 1, chunk, in);
+		if (nread != chunk) {
+			if (feof(in)) {
+				fprintf(stderr,
+					"payload-import: truncated payload while reading %s from %s "
+					"(offset=%llu wanted=%llu got=%llu)\n",
+					name, device,
+					copied,
+					(unsigned long long)chunk,
+					(unsigned long long)nread);
+			} else {
+				fprintf(stderr,
+					"payload-import: read error while reading %s from %s "
+					"(offset=%llu): %s\n",
+					name, device, copied, strerror(errno));
+			}
+			free(buf);
+			return 1;
+		}
+		written = fwrite(buf, 1, chunk, out);
+		if (written != chunk) {
+			fprintf(stderr,
+				"payload-import: write error while writing %s to %s "
+				"(offset=%llu wanted=%llu wrote=%llu): %s\n",
+				name, out_path,
+				copied,
+				(unsigned long long)chunk,
+				(unsigned long long)written,
+				strerror(errno));
+			free(buf);
+			return 1;
+		}
+		remaining -= (unsigned long long)chunk;
+	}
+
+	free(buf);
+	return 0;
+}
+
+static int is_valid_name(const char *name)
+{
+	const unsigned char *s = (const unsigned char *)name;
+
+	if (*s == 0) {
+		return 0;
+	}
+
+	while (*s != 0) {
+		if (*s == '/' || *s == '\\') {
+			return 0;
+		}
+		s += 1;
+	}
+	return 1;
+}
+
+static int has_payload_magic(const char *path)
+{
+	FILE *in;
+	char magic[MAGIC_LEN];
+
+	in = fopen(path, "rb");
+	if (in == NULL) {
+		return 1;
+	}
+	if (read_exact(in, magic, MAGIC_LEN) != 0) {
+		fclose(in);
+		return 1;
+	}
+	fclose(in);
+	if (memcmp(magic, MAGIC, MAGIC_LEN) != 0) {
+		return 1;
+	}
+	return 0;
+}
+
+#ifndef __i386__
+#error "This is only for x86 i386 fiwix/linux"
+#endif
+static int sys_mount(const char *source, const char *target,
+	const char *fstype, unsigned int flags, const void *data)
+{
+	int ret;
+	/* Only for x86 fiwix/linux */
+	__asm__ __volatile__(
+		"int $0x80"
+		: "=a"(ret)
+		: "0"(SYS_MOUNT),
+		  "b"(source),
+		  "c"(target),
+		  "d"(fstype),
+		  "S"(flags),
+		  "D"(data)
+		: "memory"
+	);
+
+	return ret;
+}
+
+static int ensure_proc_partitions(void)
+{
+	struct stat st;
+	int ret;
+
+	if (stat("/proc/partitions", &st) == 0) {
+		return 0;
+	}
+
+	if (mkdir("/proc", 0755) != 0 && errno != EEXIST) {
+		return 1;
+	}
+
+	ret = sys_mount("proc", "/proc", "proc", 0U, (const void *)0);
+	if (ret < 0) {
+		return 1;
+	}
+
+	if (stat("/proc/partitions", &st) != 0) {
+		return 1;
+	}
+
+	return 0;
+}
+
+static int extract_payload(const char *device, const char *dest_dir)
+{
+	FILE *in;
+	char magic[MAGIC_LEN];
+	unsigned char u64buf[8];
+	unsigned long long file_count;
+	unsigned long long i;
+
+	in = fopen(device, "rb");
+	if (in == NULL) {
+		fprintf(stderr, "payload-import: cannot open %s: %s\n", device, strerror(errno));
+		return 1;
+	}
+
+	if (read_exact(in, magic, MAGIC_LEN) != 0 || memcmp(magic, MAGIC, MAGIC_LEN) != 0) {
+		fclose(in);
+		fprintf(stderr, "payload-import: %s is not a payload image\n", device);
+		return 1;
+	}
+
+	if (read_exact(in, u64buf, 8) != 0) {
+		fclose(in);
+		fputs("payload-import: malformed payload header\n", stderr);
+		return 1;
+	}
+	file_count = read_u64le(u64buf);
+	if (file_count > 200000ULL) {
+		fclose(in);
+		fprintf(stderr, "payload-import: unreasonable file count: %llu\n", file_count);
+		return 1;
+	}
+
+	if (mkdir(dest_dir, 0755) != 0 && errno != EEXIST) {
+		fclose(in);
+		fprintf(stderr, "payload-import: cannot create %s: %s\n", dest_dir, strerror(errno));
+		return 1;
+	}
+
+	printf("payload-import: reading %llu files from %s\n", file_count, device);
+	for (i = 0; i < file_count; ++i) {
+		unsigned long long name_len;
+		unsigned long long data_len;
+		char *name;
+		char out_path[4096];
+		FILE *out;
+
+		if (read_exact(in, u64buf, 8) != 0) {
+			fclose(in);
+			fputs("payload-import: truncated entry header\n", stderr);
+			return 1;
+		}
+		name_len = read_u64le(u64buf);
+		if (read_exact(in, u64buf, 8) != 0) {
+			fclose(in);
+			fputs("payload-import: truncated entry size\n", stderr);
+			return 1;
+		}
+		data_len = read_u64le(u64buf);
+
+		if (name_len == 0ULL || name_len > (unsigned long long)MAX_NAME_LEN) {
+			fclose(in);
+			fprintf(stderr, "payload-import: invalid name length %llu\n", name_len);
+			return 1;
+		}
+
+		name = (char *)malloc((size_t)name_len + 1U);
+		if (name == NULL) {
+			fclose(in);
+			fputs("payload-import: out of memory\n", stderr);
+			return 1;
+		}
+
+		if (read_exact(in, name, (size_t)name_len) != 0) {
+			free(name);
+			fclose(in);
+			fputs("payload-import: truncated file name\n", stderr);
+			return 1;
+		}
+		name[(size_t)name_len] = 0;
+
+		if (!is_valid_name(name)) {
+			fclose(in);
+			fprintf(stderr, "payload-import: invalid payload file name: %s\n", name);
+			free(name);
+			return 1;
+		}
+
+		if (snprintf(out_path, sizeof(out_path), "%s/%s", dest_dir, name) >= (int)sizeof(out_path)) {
+			free(name);
+			fclose(in);
+			fputs("payload-import: output path too long\n", stderr);
+			return 1;
+		}
+
+		out = fopen(out_path, "wb");
+		if (out == NULL) {
+			fprintf(stderr, "payload-import: cannot write %s: %s\n", out_path, strerror(errno));
+			free(name);
+			fclose(in);
+			return 1;
+		}
+
+		if (copy_exact(in, out, data_len, device, name, out_path) != 0) {
+			free(name);
+			fclose(out);
+			unlink(out_path);
+			fclose(in);
+			return 1;
+		}
+
+		fclose(out);
+		printf("payload-import: %s\n", name);
+		free(name);
+	}
+
+	fclose(in);
+	return 0;
+}
+
+static void usage(const char *name)
+{
+	fprintf(stderr,
+		"Usage:\n"
+		"  %s --mount-proc\n"
+		"  %s --probe <device>\n"
+		"  %s --device <device> <dest-dir>\n",
+		name, name, name);
+}
+
+int main(int argc, char **argv)
+{
+	const char *device = NULL;
+	const char *dest_dir = NULL;
+	int i;
+
+	if (argc == 2 && strcmp(argv[1], "--mount-proc") == 0) {
+		return ensure_proc_partitions();
+	}
+
+	if (argc == 3 && strcmp(argv[1], "--probe") == 0) {
+		return has_payload_magic(argv[2]);
+	}
+
+	for (i = 1; i < argc; ++i) {
+		if (strcmp(argv[i], "--device") == 0) {
+			i += 1;
+			if (i >= argc) {
+				usage(argv[0]);
+				return 1;
+			}
+			device = argv[i];
+		} else if (dest_dir == NULL) {
+			dest_dir = argv[i];
+		} else {
+			usage(argv[0]);
+			return 1;
+		}
+	}
+
+	if (device == NULL || dest_dir == NULL) {
+		usage(argv[0]);
+		return 1;
+	}
+
+	return extract_payload(device, dest_dir);
+}