motiejus/config
1
Fork 0
Code Packages Releases Activity

Revert "orangepi5+: skip perf only in sdImage"

Browse Source 
This reverts commit 7315cbaaac.

    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
This commit is contained in:
Motiejus Jakštys 2024-03-13 22:29:08 +02:00
parent 46ebdf600e
commit f952b637d5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/op5p/configuration.nix
View File

@ -5,7 +5,6 @@
]; ];
mj = { mj = {
skipPerf = true;
stateVersion = "23.11"; stateVersion = "23.11";
timeZone = "UTC"; timeZone = "UTC";
username = "nixos"; username = "nixos";

2
shared/platform/orangepi5plus.nix
View File

@ -8,6 +8,8 @@
crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform; crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform;
crossNative = pkgs.pkgsCross.aarch64-multiplatform; crossNative = pkgs.pkgsCross.aarch64-multiplatform;
in { in {
mj.skipPerf = true;
boot = { boot = {
kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec { kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec {
version = "6.8.0"; version = "6.8.0";