motiejus/config

commit f952b637d5b5c561e7790e23959a4bd2f561ce4e (tree)
parent 46ebdf600ef906fca0604311de1d104f571a91ab
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Wed, 13 Mar 2024 22:29:08 +0200

Revert "orangepi5+: skip perf only in sdImage"

This reverts commit 7315cbaaace89cfaf12303484ca4bfb141e05c65.

    builder for '/nix/store/863lc3ir4ahpxzq6bcjv940xzkbbc04m-perf-linux-aarch64-unknown-linux-gnu-6.8.0.drv' failed with exit code 2;
    last 10 log lines:
    >   149 | #if defined(LIBTRACEEVENT_VERSION) &&  LIBTRACEEVENT_VERSION >= MAKE_LIBTRACEEVENT_VERSION(1, 5, 0)
    >       |                                                              ^~
    > error: command '/nix/store/ffi9k9y0w3sydgp2nk3q1pk0qq02rkb0-aarch64-unknown-linux-gnu-gcc-wrapper-12.3.0/bin/aarch64-unknown-linux-gnu-cc' failed wit>
    >   LD      /build/source/tools/perf/libbpf/staticobjs/libbpf-in.o
    > cp: cannot stat 'python_ext_build/lib/perf*.so': No such file or directory
    > make[2]: *** [Makefile.perf:678: python/perf.cpython-311-aarch64-linux-gnu.so] Error 1
    > make[2]: *** Waiting for unfinished jobs....
    >   LINK    /build/source/tools/perf/libbpf/libbpf.a
    > make[1]: *** [Makefile.perf:261: sub-make] Error 2
    > make: *** [Makefile:70: all] Error 2

Diffstat:
M
hosts/op5p/configuration.nix
 | 
1
-
M
shared/platform/orangepi5plus.nix
 | 
2
++

2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/hosts/op5p/configuration.nix b/hosts/op5p/configuration.nix
@@ -5,7 +5,6 @@
   ];
 
   mj = {
-    skipPerf = true;
     stateVersion = "23.11";
     timeZone = "UTC";
     username = "nixos";
diff --git a/shared/platform/orangepi5plus.nix b/shared/platform/orangepi5plus.nix
@@ -8,6 +8,8 @@
   crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform;
   crossNative = pkgs.pkgsCross.aarch64-multiplatform;
 in {
+  mj.skipPerf = true;
+
   boot = {
     kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec {
       version = "6.8.0";