remove jffs2boot target
It's not needed now initramfs is compiled into the kernel.
This commit is contained in:
parent
3595e36294
commit
2c4f8b823e
2 changed files with 2 additions and 12 deletions
|
@ -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
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -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
|
||||
''
|
||||
|
|
Loading…
Reference in a new issue