lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

t #2

Closed
lbailly wants to merge 57 commits from CI into main
pull from: CI
merge into: lbailly:main
Conversation 0 Commits 57 Files changed 67 +16 -7
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b468275f53 - Show all commits

23
modules/outputs/tftpboot.nix
View file

@ -12,10 +12,15 @@ let
arch = pkgs.stdenv.hostPlatform.linuxArch; arch = pkgs.stdenv.hostPlatform.linuxArch;
# UBI cannot run on the top of phram. # UBI cannot run on the top of phram.
needsSquashfs = config.rootfsType == "ubifs"; needsJffs2 = config.rootfsType == "ubifs";
rootfstype = if needsSquashfs then "squashfs" else config.rootfsType; # squashfs doesn't work out for us because only `bootablerootdir`
rootfs = if needsSquashfs then # contain what we need to boot, not `config.filesystem.contents` alas.
liminix.builders.squashfs config.filesystem.contents rootfstype = if needsJffs2 then "jffs2" else config.rootfsType;
rootfs = if needsJffs2 then
liminix.builders.jffs2 {
bootableRootDirectory = config.system.outputs.bootablerootdir;
inherit (config.hardware.flash) eraseBlockSize;
}
else config.system.outputs.rootfs; else config.system.outputs.rootfs;
in { in {
imports = [ ../ramdisk.nix ]; imports = [ ../ramdisk.nix ];
@ -82,9 +87,13 @@ in {
config = { config = {
boot.ramdisk.enable = true; boot.ramdisk.enable = true;
kernel.config = mkIf needsSquashfs { kernel.config = mkIf needsJffs2 {
SQUASHFS = "y"; JFFS2_FS = "y";
SQUASHFS_XZ = "y"; JFFS2_LZO = "y";
JFFS2_RTIME = "y";
JFFS2_COMPRESSION_OPTIONS = "y";
JFFS2_ZLIB = "y";
JFFS2_CMODE_SIZE = "y";
}; };
system.outputs = rec { system.outputs = rec {