From 9dd92ac53e29cf2ea7bc54b1e528688791c2fdb4 Mon Sep 17 00:00:00 2001 From: kurogeek Date: Tue, 14 Oct 2025 10:07:38 +0700 Subject: [PATCH] mob next [ci-skip] [ci skip] [skip ci] lastFile:pkgs/kernel/default.nix --- devices/gl-ar750/default.nix | 5 ++--- pkgs/kernel/default.nix | 9 +++++++++ pkgs/kernel/dtb.nix | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/devices/gl-ar750/default.nix b/devices/gl-ar750/default.nix index 0339504..b8d9c40 100644 --- a/devices/gl-ar750/default.nix +++ b/devices/gl-ar750/default.nix @@ -61,9 +61,8 @@ OpenWrt web page: https://openwrt.org/toh/gl.inet/gl-ar750 let inherit (lib) mkIf; openwrt = pkgs.openwrt; - firmwareBlobs = pkgs.pkgsBuildBuild.fetchFromGitHub { - owner = "kvalo"; - repo = "ath10k-firmware"; + firmwareBlobs = pkgs.pkgsBuildBuild.fetchgit { + url = "https://git.codelinaro.org/clo/ath-firmware/ath10k-firmware"; rev = "5d63529ffc6e24974bc7c45b28fd1c34573126eb"; sha256 = "1bwpifrwl5mvsmbmc81k8l22hmkwk05v7xs8dxag7fgv2kd6lv2r"; }; diff --git a/pkgs/kernel/default.nix b/pkgs/kernel/default.nix index 0fe25a7..a6910b0 100644 --- a/pkgs/kernel/default.nix +++ b/pkgs/kernel/default.nix @@ -98,6 +98,11 @@ stdenv.mkDerivation rec { checkConfigurationPhase = '' echo Checking required config items: + echo ====================================================== + echo ====================================================== + echo ------------------------------------------------------ + echo $modulesupport + echo ------------------------------------------------------ if comm -2 -3 <(grep 'CONFIG' ${kconfigFile} |sort) <(grep 'CONFIG' .config|sort) |grep '.' ; then echo -e "^^^ Some configuration lost :-(\nPerhaps you have mutually incompatible settings, or have disabled options on which these depend.\n" exit 0 @@ -119,5 +124,9 @@ stdenv.mkDerivation rec { make modules cp -a . $modulesupport cp .config $config + echo ------------------------------------------------------ + cat .config + echo $config + echo ------------------------------------------------------ ''; } diff --git a/pkgs/kernel/dtb.nix b/pkgs/kernel/dtb.nix index a58d3e4..7a40c6c 100644 --- a/pkgs/kernel/dtb.nix +++ b/pkgs/kernel/dtb.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation { phases = [ "buildPhase" ]; nativeBuildInputs = [ dtc ]; buildPhase = '' + echo ================================================== + echo ${dtcSearchFlags} + echo == + echo ${cppDtSearchFlags} + echo ================================================== ${stdenv.cc.targetPrefix}cpp -nostdinc -x assembler-with-cpp ${cppDtSearchFlags} -undef -D__DTS__ -o dtb.tmp ${combined} dtc ${dtcSearchFlags} -I dts -O dtb -o $out dtb.tmp # dtc -I dtb -O dts $out