rename flashable->flashimage, o.squashfs to rootfs

"rootfs" describes what it is for, "squashfs" merely says
how it's implemented

(also, rootfs-as-jffs2 will soon be added)
This commit is contained in:
Daniel Barlow
2023-04-10 18:09:37 +01:00
parent 2e15acd61c
commit 0687ae7f5c
11 changed files with 27 additions and 27 deletions

View File

@@ -17,7 +17,7 @@ in
};
config = {
outputs = rec {
squashfs = liminix.builders.squashfs config.filesystem.contents;
rootfs = liminix.builders.squashfs config.filesystem.contents;
tftpd = pkgs.buildPackages.tufted;
kernel = liminix.builders.kernel.override {
inherit (config.kernel) config src extraPatchPhase;
@@ -40,13 +40,13 @@ in
} ''
mkdir $out
dd if=${uimage} of=$out/firmware.bin bs=128k conv=sync
dd if=${squashfs} of=$out/firmware.bin bs=128k conv=sync,nocreat,notrunc oflag=append
dd if=${rootfs} of=$out/firmware.bin bs=128k conv=sync,nocreat,notrunc oflag=append
'';
vmroot = pkgs.runCommand "qemu" {} ''
mkdir $out
cd $out
ln -s ${squashfs} squashfs
ln -s ${rootfs} rootfs
ln -s ${kernel} vmlinux
ln -s ${manifest} manifest
ln -s ${kernel.headers} build