dan/liminix
1
0
Fork 5
Code

Compare commits

base: dan:83ee488e4c81124380b8bd4ff8183e632f30eb91
Branches Tags
dan:main
dan:nftables-turned
dan:firescape
dan:runciter
dan:wip-pstore-tls
dan:fallover
dan:lte
dan:gateway-profile
dan:tftpboot-append-dtb
dan:mainline-omnia-wip
dan:armv7
dan:hark-how-all-the-belkin-rings
dan:first-do-no-arm
dan:doc-do-over
dan:module-based-network
dan:v1.0.0
..
compare: dan:f0490f37d500fb2996b15badc4ef3928cf41ac6a
Branches Tags
dan:main
dan:nftables-turned
dan:firescape
dan:runciter
dan:wip-pstore-tls
dan:fallover
dan:lte
dan:gateway-profile
dan:tftpboot-append-dtb
dan:mainline-omnia-wip
dan:armv7
dan:hark-how-all-the-belkin-rings
dan:first-do-no-arm
dan:doc-do-over
dan:module-based-network
dan:v1.0.0

No commits in common. "83ee488e4c81124380b8bd4ff8183e632f30eb91" and "f0490f37d500fb2996b15badc4ef3928cf41ac6a" have entirely different histories.
83ee488e4c ... f0490f37d5

2 changed files with 1 additions and 2 deletions
Show Stats Expand all files Collapse all files

1
devices/turris-omnia/default.nix
View File

@ -130,7 +130,6 @@
MVNETA_BM_ENABLE = "y"; MVNETA_BM_ENABLE = "y";
SRAM = "y"; # mmio-sram is "compatible" for bm_bppi reqd by BM SRAM = "y"; # mmio-sram is "compatible" for bm_bppi reqd by BM
PHY_MVEBU_A38X_COMPHY = "y"; # for eth2 PHY_MVEBU_A38X_COMPHY = "y"; # for eth2
MARVELL_PHY = "y";
MVPP2 = "y"; MVPP2 = "y";
MV_XOR = "y"; MV_XOR = "y";

2
pkgs/systemconfig/default.nix
View File

@ -95,7 +95,7 @@ in attrset:
if test -d $dest/persist; then dest=$dest/persist; fi if test -d $dest/persist; then dest=$dest/persist; fi
cp -v -fP \$src/bin/* \$src/etc/* \$dest cp -v -fP \$src/bin/* \$src/etc/* \$dest
${if attrset ? boot then '' ${if attrset ? boot then ''
(cd \$dest && rm ./boot && ln -sf ${lib.strings.removePrefix "/" attrset.boot.target} ./boot) (cd \$prefix && rm ./boot && ln -sf ${lib.strings.removePrefix "/" attrset.boot.target} ./boot)
'' else ""} '' else ""}
EOF EOF
chmod +x $out/bin/install chmod +x $out/bin/install