dan
/
liminix
1
0
Fork 5
Code Issues 3 Pull Requests 1 Projects Releases Wiki Activity

remove jffs2boot target 

It's not needed now initramfs is compiled into the kernel.
module-based-network
Daniel Barlow 2023-04-23 11:31:48 +01:00
parent 3595e36294
commit 2c4f8b823e
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/jffs2.nix
View File

@ -43,16 +43,6 @@ in
grafts=$(sed < $pkgClosure/store-paths 's/^\(.*\)$/--graft \1:\1/g') 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 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
'';
}; };
}; };
} }

4
tests/jffs2/test.nix
View File

@ -5,7 +5,7 @@
let img = (import liminix { let img = (import liminix {
device = import "${liminix}/devices/qemu/"; device = import "${liminix}/devices/qemu/";
liminix-config = ./configuration.nix; liminix-config = ./configuration.nix;
}).outputs.jffs2boot; }).outputs.vmroot;
pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; }; pkgs = import <nixpkgs> { overlays = [(import ../../overlay.nix)]; };
inherit (pkgs.pkgsBuildBuild) routeros mips-vm; inherit (pkgs.pkgsBuildBuild) routeros mips-vm;
in pkgs.runCommand "check" { in pkgs.runCommand "check" {
@ -39,6 +39,6 @@ fatal(){
trap fatal ERR trap fatal ERR
mkdir vm mkdir vm
mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs ${img}/initramfs mips-vm --background ./vm ${img}/vmlinux ${img}/rootfs
expect ${./script.expect} >$out expect ${./script.expect} >$out
'' ''