Merge pull request #250179 from Ma27/linux-rt-fix

linux: make main update script slightly more robust

authored by

Maximilian Bosch and committed by
GitHub
3ff88c2e 14a82b50

+13 -9
+3 -3
pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
··· 6 , ... } @ args: 7 8 let 9 - version = "6.1.33-rt11"; # updated by ./update-rt.sh 10 branch = lib.versions.majorMinor version; 11 kversion = builtins.elemAt (lib.splitString "-" version) 0; 12 in buildLinux (args // { ··· 18 19 src = fetchurl { 20 url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; 21 - sha256 = "1kfj7mi3n2lfaw4spz5cbvcl1md038figabyg80fha3kxal6nzdq"; 22 }; 23 24 kernelPatches = let rt-patch = { 25 name = "rt"; 26 patch = fetchurl { 27 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 28 - sha256 = "0swzp6brk01r7pb73yada18vf6fhdqq4c78abq3abj6y8ay0awhh"; 29 }; 30 }; in [ rt-patch ] ++ kernelPatches; 31
··· 6 , ... } @ args: 7 8 let 9 + version = "6.1.46-rt13"; # updated by ./update-rt.sh 10 branch = lib.versions.majorMinor version; 11 kversion = builtins.elemAt (lib.splitString "-" version) 0; 12 in buildLinux (args // { ··· 18 19 src = fetchurl { 20 url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz"; 21 + sha256 = "15m228bllks2p8gpsmvplx08yxzp7bij9fnmnafqszylrk7ppxpm"; 22 }; 23 24 kernelPatches = let rt-patch = { 25 name = "rt"; 26 patch = fetchurl { 27 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; 28 + sha256 = "00pj02mvamxvlkwrca1j3baaa18rg6dra7al1xsvgw3ypckwyafz"; 29 }; 30 }; in [ rt-patch ] ++ kernelPatches; 31
+10 -6
pkgs/os-specific/linux/kernel/update.sh
··· 58 echo "Updated $OLDVER -> $V" 59 done 60 61 - # Update linux-rt 62 - COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh 63 64 - # Update linux-libre 65 - COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh 66 67 - # Update linux-hardened 68 - COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py
··· 58 echo "Updated $OLDVER -> $V" 59 done 60 61 + # Allowing errors again: one broken update script shouldn't inhibit the 62 + # update of other kernel variants. 63 + set +e 64 65 + echo Update linux-rt 66 + COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh || echo "update-rt failed with exit code $?" 67 68 + echo Update linux-libre 69 + COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh || echo "update-libre failed with exit code $?" 70 + 71 + echo Update linux-hardened 72 + COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py || echo "update-hardened failed with exit code $?"