Skip to content

Commit

Permalink
linux/hardened/patches/5.4: 5.4.88.a -> 5.4.89.a
Browse files Browse the repository at this point in the history 
(cherry picked from commit dca6184)
  • Loading branch information
@kraem @NeQuissimus
kraem authored and NeQuissimus committed Jan 13, 2021
1 parent 6c5dd7d commit 0768790
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/os-specific/linux/kernel/hardened/patches.json
View file
Expand Up @@ -10,9 +10,9 @@
"url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.167.a/linux-hardened-4.19.167.a.patch"
},
"5.4": {
"name": "linux-hardened-5.4.86.a.patch",
"sha256": "0j1wr6d42rbxd66vhsp9l3lp3nv0p1j0cpir9pxshd8w9zlbdy88",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.86.a/linux-hardened-5.4.86.a.patch"
"name": "linux-hardened-5.4.89.a.patch",
"sha256": "1rbk8j8f31j8jjb7p29q3sv538jjlrc9mgxrac4pga11dmxzgahk",
"url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.89.a/linux-hardened-5.4.89.a.patch"
},
"5.8": {
"name": "linux-hardened-5.8.18.a.patch",
Expand Down

4 comments on commit 0768790

@ivan
Copy link
Member

@ivan ivan commented on 0768790 Jan 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kraem @NeQuissimus broken build at this commit, check out origin/release-20.09 and nix-env -iA linuxPackages_hardened.kernel will show

  LINK     /build/linux-5.4.89/build/tools/objtool/objtool
make[1]: Leaving directory '/build/linux-5.4.89/build'
Error: modDirVersion 5.4.89-hardened specified in the Nix expression is wrong, it should be: 5.4.89.a-hardened
builder for '/nix/store/m9b2q8p190hg5i1k6sgmv534nrs5qlqf-linux-5.4.89.drv' failed with exit code 1
error: build of '/nix/store/m9b2q8p190hg5i1k6sgmv534nrs5qlqf-linux-5.4.89.drv' failed

@ajs124
Copy link
Member

@ajs124 ajs124 commented on 0768790 Jan 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backporting 4312cd7 should fix this.

@NeQuissimus
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#108609 sent the change into staging-20.09.
But I'll pick it separately to unblock this.

@NeQuissimus
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nvm, looks like it's already been merged :)

Please sign in to comment.