From 821ff387daf87a24e5637db5b7a8c081fb8ff7ed Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 16 Dec 2019 11:24:53 -0500 Subject: linux-testing: 5.5-rc1 -> 5.5-rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6636efaf96d..f89a7c93730 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5-rc1"; + version = "5.5-rc2"; extraMeta.branch = "5.5"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0d2s2z08bj8jp4hnx116wpvivx7h8risv2xdxj7155lz155gffdp"; + sha256 = "1fs432ld5k1j68hflqdxby9mxa6a7xnw1m6z5lfb9341gjw078xc"; }; # Should the testing kernels ever be built on Hydra? -- cgit 1.4.1 From 80a823eeca9ed3e9ceaa6843263b2579e6c3215e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 16 Dec 2019 04:25:42 +0000 Subject: linux/update.sh: update linux-libre too update-libre.sh doesn't commit by default so that it can be used as an updateScript, where I don't think auto-committing is the norm. The generated commit messages say "linux-libre_latest" rather than "linux-libre", because even though linux-libre will also be rebuilt, it's linux-libre_latest that is more likely to need it. --- pkgs/os-specific/linux/kernel/linux-libre.nix | 3 --- pkgs/os-specific/linux/kernel/update-libre.sh | 26 ++++++++++++++++++++++++++ pkgs/os-specific/linux/kernel/update.sh | 3 +++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100755 pkgs/os-specific/linux/kernel/update-libre.sh (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d29a2382c2a..3340551e16d 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,9 +1,6 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - - # Update this if linux_latest-libre fails to build. - # $ curl https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ | grep -Eo 'Revision [0-9]+' rev = "16794"; sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j"; } diff --git a/pkgs/os-specific/linux/kernel/update-libre.sh b/pkgs/os-specific/linux/kernel/update-libre.sh new file mode 100755 index 00000000000..49d73e66d9a --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update-libre.sh @@ -0,0 +1,26 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix-prefetch-svn git curl +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +path="$nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix" + +old_rev="$(grep -o 'rev = ".*"' "$path" | awk -F'"' '{print $2}')" + +svn_url=https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/ +rev="$(curl -s "$svn_url" | grep -Em 1 -o 'Revision [0-9]+' | awk '{print $2}')" + +if [ "$old_rev" = "$rev" ]; then + echo "No updates for linux-libre" + exit 0 +fi + +sha256="$(QUIET=1 nix-prefetch-svn "$svn_url" "$rev" | tail -1)" + +sed -i -e "s/rev = \".*\"/rev = \"$rev\"/" \ + -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" "$path" + +if [ -n "$COMMIT" ]; then + git commit -qm "linux-libre_latest: $old_rev -> $rev" "$path" + echo "Updated linux-libre_latest $old_rev -> $rev" +fi diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 7a86b05dafc..dbfa052d292 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -57,3 +57,6 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do echo "Updated $OLDVER -> $V" done + +# Update linux-libre +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh -- cgit 1.4.1 From 2d3e4088db37dbeb8f239afb643f02668cfd2975 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 16 Dec 2019 04:27:41 +0000 Subject: linux-libre: set update-libre.sh as update script This doesn't actually update the kernel, just the linux-libre deblobbing scripts, but it should mean that automatic updaters keep the deblobbing scripts up to date. So even if deblobbing scripts for a new kernel version are not available immediately after release, they should be updated automatically soon enough once available. --- pkgs/os-specific/linux/kernel/linux-libre.nix | 2 ++ 1 file changed, 2 insertions(+) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 3340551e16d..1f35e0209e4 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -33,6 +33,8 @@ in linux.override { ''; }; + passthru.updateScript = ./update-libre.sh; + maintainers = [ lib.maintainers.qyliss ]; }; } -- cgit 1.4.1 From 987a59e295e6803dc282a125757e9be6afe723c0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 16 Dec 2019 13:55:50 +0000 Subject: linux-libre_latest: 16794 -> 17112 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 1f35e0209e4..fb5244e28ea 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "16794"; - sha256 = "1lpaka4hs7yrpnrzfybd6radjylwvw2p4aly68pypykqs2srvm7j"; + rev = "17112"; + sha256 = "049vmi9q1vrcrq9p1zxj6bhhpkgy8fsyh955b54z3xlw7czng1s1"; } , ... }: -- cgit 1.4.1 From d770ae120293e8e796ab7c974c123f143bc9d5a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 16 Dec 2019 16:35:53 +0000 Subject: linux-libre.updateScript: fix attr in commit msg --- pkgs/os-specific/linux/kernel/update-libre.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific/linux/kernel') diff --git a/pkgs/os-specific/linux/kernel/update-libre.sh b/pkgs/os-specific/linux/kernel/update-libre.sh index 49d73e66d9a..3b8a00edcda 100755 --- a/pkgs/os-specific/linux/kernel/update-libre.sh +++ b/pkgs/os-specific/linux/kernel/update-libre.sh @@ -21,6 +21,6 @@ sed -i -e "s/rev = \".*\"/rev = \"$rev\"/" \ -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" "$path" if [ -n "$COMMIT" ]; then - git commit -qm "linux-libre_latest: $old_rev -> $rev" "$path" - echo "Updated linux-libre_latest $old_rev -> $rev" + git commit -qm "linux_latest-libre: $old_rev -> $rev" "$path" + echo "Updated linux_latest-libre $old_rev -> $rev" fi -- cgit 1.4.1