nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

raspberry-pi: replace postConfigure sed hack with structuredExtraConfig

Browse source 
Set CONFIG_LOCALVERSION via structuredExtraConfig instead of patching
.config and auto.conf with sed after configure. The vendor defconfigs
set -v7, -v8, -v8-16k which breaks modDirVersion.
This commit is contained in:
Jamie Magee 2026-05-03 14:06:51 -07:00
parent 10c5286181
commit 554e00a592
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
raspberry-pi/common/kernel.nix
View file

@ -12,6 +12,7 @@ let
# NOTE: raspberryPiWirelessFirmware should be updated with this # NOTE: raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.12.75"; modDirVersion = "6.12.75";
hash = "sha256-qrljd20n4tj/7C7gzNnxw7JIyEF2Ppf1PWm2a7vxh1w="; hash = "sha256-qrljd20n4tj/7C7gzNnxw7JIyEF2Ppf1PWm2a7vxh1w=";
inherit (lib.kernel) freeform;
in in
(buildLinux ( (buildLinux (
args args
@ -50,6 +51,12 @@ in
request_key_helper request_key_helper
]; ];
structuredExtraConfig = {
# Vendor defconfigs set CONFIG_LOCALVERSION to -v7, -v8, -v8-16k, which
# breaks modDirVersion. Clear it.
LOCALVERSION = freeform "";
};
extraMeta = extraMeta =
if (rpiVersion < 3) then if (rpiVersion < 3) then
{ {
@ -66,12 +73,6 @@ in
// (args.argsOverride or { }) // (args.argsOverride or { })
)).overrideAttrs )).overrideAttrs
{ {
postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
'';
# The vendor kernel uses different DTB names (bcm2708/bcm2709/bcm2710) than what # The vendor kernel uses different DTB names (bcm2708/bcm2709/bcm2710) than what
# U-Boot expects (bcm2835/bcm2836/bcm2837). Starting with Pi 4, names match. # U-Boot expects (bcm2835/bcm2836/bcm2837). Starting with Pi 4, names match.
# See: https://github.com/u-boot/u-boot/blob/master/board/raspberrypi/rpi/rpi.c # See: https://github.com/u-boot/u-boot/blob/master/board/raspberrypi/rpi/rpi.c