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

move output module imports example -> device

Browse source 
The outputs available are a characteristic of the device, not
the example.
This commit is contained in:
Daniel Barlow 2023-12-10 16:38:53 +00:00
parent c81e7c4d35
commit 5eeb277564
16 changed files with 44 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
devices/belkin-rt3200/default.nix
View file

@ -48,7 +48,12 @@
'';
};
in {
imports = [ ../../modules/arch/aarch64.nix ];
imports = [
../../modules/arch/aarch64.nix
../../modules/outputs/tftpboot.nix
../../modules/outputs/ubifs.nix
];
config = {
kernel = {
src = pkgs.pkgsBuildBuild.fetchurl {
name = "linux.tar.gz";
@ -220,6 +225,6 @@
};
};
};
};
};
}

3
devices/families/qemu.nix
View file

@ -1,5 +1,8 @@
{ config, pkgs, ... }:
{
imports = [
../../modules/outputs/jffs2.nix
];
config = {
kernel = {
src = pkgs.pkgsBuildBuild.fetchurl {

3
devices/gl-ar750/default.nix
View file

@ -96,6 +96,9 @@
imports = [
../../modules/network
../../modules/arch/mipseb.nix
../../modules/outputs/tftpboot.nix
../../modules/outputs/flashimage.nix
../../modules/outputs/jffs2.nix
];
programs.busybox.options = {

7
devices/gl-mt300a/default.nix
View file

@ -52,7 +52,12 @@
klibBuild = config.system.outputs.kernel.modulesupport;
};
in {
imports = [ ../../modules/arch/mipsel.nix ];
imports = [
../../modules/arch/mipsel.nix
../../modules/outputs/tftpboot.nix
../../modules/outputs/flashimage.nix
../../modules/outputs/jffs2.nix
];
hardware = {
defaultOutput = "flashimage";
loadAddress = lim.parseInt "0x80000000";

7
devices/gl-mt300n-v2/default.nix
View file

@ -52,7 +52,12 @@
hash = "sha256:1dkhfznmdz6s50kwc841x3wj0h6zg6icg5g2bim9pvg66as2vmh9";
};
in {
imports = [ ../../modules/arch/mipsel.nix ];
imports = [
../../modules/arch/mipsel.nix
../../modules/outputs/tftpboot.nix
../../modules/outputs/flashimage.nix
../../modules/outputs/jffs2.nix
];
filesystem = dir {
lib = dir {
firmware = dir {

12
devices/turris-omnia/default.nix
View file

@ -12,7 +12,13 @@
module = {pkgs, config, lib, lim, ... }:
let openwrt = pkgs.openwrt; in {
imports = [ ../../modules/arch/arm.nix ];
imports = [
../../modules/arch/arm.nix
../modules/outputs/tftpboot.nix
../modules/outputs/diskimage.nix
../modules/outputs/extlinux.nix
../modules/outputs/ext4fs.nix
];
kernel = {
src = pkgs.pkgsBuildBuild.fetchurl {
name = "linux.tar.gz";
@ -46,10 +52,6 @@
# WARNING: unmet direct dependencies detected for ARCH_WANT_LIBATA_LEDS
ATA = "y";
# switch is DSA
# CONFIG_NET_DSA_MV88E6060=y
# CONFIG_NET_DSA_MV88E6XXX=y
# CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
# CONFIG_REGMAP=y
# CONFIG_REGMAP_I2C=y

7
examples/arhcive.nix
View file

@ -30,14 +30,7 @@ in rec {
../modules/ssh
../modules/watchdog
../modules/mount
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
];
hostname = "arhcive";
kernel = {

5
examples/demo.nix
View file

@ -33,11 +33,6 @@ in rec {
../modules/ntp
../modules/ppp
../modules/ssh
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
../modules/vlan
../modules/wlan.nix
];

5
examples/extneder.nix
View file

@ -30,11 +30,6 @@ in rec {
../modules/hostapd
../modules/bridge
../modules/ssh
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
];
hostname = "extneder";

1
examples/hello-from-mt300.nix
View file

@ -8,7 +8,6 @@ in rec {
../modules/network
../modules/ssh
../modules/vlan
../modules/outputs/flashimage.nix
];
boot.tftp = {

5
examples/rotuer.nix
View file

@ -43,11 +43,6 @@ in rec {
../modules/bridge
../modules/ntp
../modules/ssh
../modules/outputs/tftpboot.nix
../modules/outputs/kexecboot.nix
../modules/outputs/flashimage.nix
../modules/outputs/jffs2.nix
../modules/outputs/ubifs.nix
];
rootfsType = "jffs2";
hostname = "rotuer";

4
modules/all-modules.nix
View file

@ -29,8 +29,8 @@
./ramdisk.nix
./squashfs.nix
./ssh
./tftpboot.nix
./ubifs.nix
./outputs/tftpboot.nix
./outputs/ubifs.nix
./users.nix
./vlan
./watchdog

0
modules/ext4fs.nix → modules/outputs/ext4fs.nix
View file

10
tests/ext4/configuration.nix
View file

@ -3,12 +3,11 @@ let
inherit (pkgs.pseudofile) dir symlink;
in {
imports = [
../../vanilla-configuration.nix
../../modules/squashfs.nix
../../modules/ext4fs.nix
../../modules/outputs/ext4fs.nix
];
config.rootfsType = "ext4";
config.filesystem = dir {
config = {
rootfsType = "ext4";
filesystem = dir {
hello = {
type = "f";
uid = 7;
@ -16,4 +15,5 @@ in {
file = "hello world";
};
};
};
}

5
vanilla-configuration-hw.nix
View file

@ -2,10 +2,5 @@
{
imports = [
./vanilla-configuration.nix
./modules/outputs/tftpboot.nix
./modules/outputs/kexecboot.nix
./modules/outputs/flashimage.nix
./modules/outputs/jffs2.nix
./modules/outputs/ubifs.nix
];
}

1
vanilla-configuration.nix
View file

@ -5,7 +5,6 @@ let
svc = config.system.service;
in rec {
imports = [
./modules/tftpboot.nix
./modules/wlan.nix
./modules/network
./modules/ntp