Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Barlow fc5def2e15 don't need ubifs u-boot patch now
23.11 has upgraded to a newer u-boot that has ubifs by default
in the qemu-arm config
2024-01-03 19:12:46 +00:00
Daniel Barlow 9369fdf314 use patched qemu only for run-liminix-vm 2024-01-03 17:53:30 +00:00
2 changed files with 4 additions and 7 deletions

View File

@ -170,11 +170,11 @@ extraPkgs // {
pppBuild = prev.ppp;
qemu = let q = prev.qemu.overrideAttrs (o: {
qemuLim = let q = prev.qemu.overrideAttrs (o: {
patches = o.patches ++ [
./pkgs/qemu/arm-image-friendly-load-addr.patch
];
}); in q.override { sdlSupport = false; };
}); in q.override { nixosTestRunner = true; sdlSupport = false; };
rsyncSmall =
let r = prev.rsync.overrideAttrs(o: {
@ -209,9 +209,6 @@ extraPkgs // {
defconfig = "qemu_arm_defconfig";
extraMeta.platforms = ["armv7l-linux"];
filesToInstall = ["u-boot.bin"];
# enable looking for boot files on ubifs. this is unused at
# present, but added in the expectation of a future test
extraPatches = [ ./pkgs/u-boot/0001-add-ubifs-to-boot-targets.patch ];
extraConfig = ''
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFS=y

View File

@ -1,5 +1,5 @@
{
qemu
qemuLim
, socat
, writeShellScript
, writeFennel
@ -9,7 +9,7 @@
, pkgsBuildBuild
}: let
run-liminix-vm = pkgsBuildBuild.writeFennel "run-liminix-vm" {
packages = [ qemu lua.pkgs.luaposix lua.pkgs.fennel ];
packages = [ qemuLim lua.pkgs.luaposix lua.pkgs.fennel ];
} ./run-liminix-vm.fnl;
connect = writeShellScript "connect-vm" ''
export PATH="${lib.makeBinPath [socat]}:$PATH"