liminix

commit 2c4f8b823e8cfc365c1ccc8d361f95e3e08edba4
parent 3595e362946c033c243dff7df9f65c871d95b754
Author: Daniel Barlow <dan@telent.net>
Date:   Sun, 23 Apr 2023 11:31:48 +0100

remove jffs2boot target

It's not needed now initramfs is compiled into the kernel.

Diffstat:
M
modules/jffs2.nix
 | 
10
----------
M
tests/jffs2/test.nix
 | 
4
++--

2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/modules/jffs2.nix b/modules/jffs2.nix
@@ -43,16 +43,6 @@ in
           grafts=$(sed < $pkgClosure/store-paths 's/^\(.*\)$/--graft \1:\1/g')
           mkfs.jffs2 --compression-mode=size ${endian} -e ${config.hardware.flash.eraseBlockSize} --enable-compressor=lzo --pad --root $TMPDIR/empty --output $out  $grafts --squash --faketime
         '';
-      jffs2boot =
-        let o = config.outputs; in
-        pkgs.runCommand "jffs2boot" {} ''
-          mkdir $out
-          cd $out
-          ln -s ${o.rootfs} rootfs
-          ln -s ${o.kernel} vmlinux
-          ln -s ${o.manifest} manifest
-          ln -s ${o.initramfs} initramfs
-       '';
     };
   };
 }
diff --git a/tests/jffs2/test.nix b/tests/jffs2/test.nix
@@ -5,7 +5,7 @@
 let img = (import liminix {
       device = import "${liminix}/devices/qemu/";
       liminix-config = ./configuration.nix;
-    }).outputs.jffs2boot;
+    }).outputs.vmroot;
     pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
     inherit (pkgs.pkgsBuildBuild) routeros mips-vm;
 in pkgs.runCommand "check" {
@@ -39,6 +39,6 @@ fatal(){
 trap fatal ERR
 
 mkdir vm
-mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs ${img}/initramfs
+mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs
 expect ${./script.expect} >$out
 ''