Commit Graph

22055 Commits

Author SHA1 Message Date
github-actions[bot]
06bc99ed31
Merge staging-next into staging 2023-03-23 18:01:57 +00:00
github-actions[bot]
307b719414
Merge master into staging-next 2023-03-23 18:01:20 +00:00
Weijia Wang
f7108e6257
Merge pull request #222674 from PhDyellow/fix_tuxedo_keyboard
tuxedo-keyboard: Fix build
2023-03-23 16:18:19 +02:00
github-actions[bot]
3568c9cf79
Merge staging-next into staging 2023-03-23 12:01:39 +00:00
Vladimír Čunát
09c3a593df
Merge branch 'master' into staging-next 2023-03-23 11:13:46 +01:00
Maximilian Bosch
ac4638a33a
Merge pull request #222683 from Ma27/linux-kernel-updates
Linux kernel updates 2023-03-23
2023-03-23 11:04:42 +01:00
Maximilian Bosch
8ee5702c66
linux/hardened/patches/6.1: 6.1.19-hardened1 -> 6.1.20-hardened1 2023-03-23 08:28:33 +01:00
Maximilian Bosch
9791cc4323
linux/hardened/patches/5.4: 5.4.236-hardened1 -> 5.4.237-hardened1 2023-03-23 08:28:19 +01:00
Maximilian Bosch
4634bbc4c5
linux/hardened/patches/5.15: 5.15.102-hardened1 -> 5.15.103-hardened1 2023-03-23 08:28:08 +01:00
Maximilian Bosch
c818f30da7
linux/hardened/patches/5.10: 5.10.174-hardened1 -> 5.10.175-hardened1 2023-03-23 08:27:54 +01:00
Maximilian Bosch
0272420a3c
linux/hardened/patches/4.19: 4.19.277-hardened1 -> 4.19.278-hardened1 2023-03-23 08:27:42 +01:00
Maximilian Bosch
79148a9f3b
linux/hardened/patches/4.14: 4.14.309-hardened1 -> 4.14.310-hardened1 2023-03-23 08:27:31 +01:00
Maximilian Bosch
c4e51ce867
linux_latest-libre: 19109 -> 19160 2023-03-23 08:26:28 +01:00
Maximilian Bosch
29b3bf6fb0
linux-rt_5_10: 5.10.168-rt83 -> 5.10.175-rt84 2023-03-23 08:26:03 +01:00
Maximilian Bosch
51b22f7f5b
linux: 6.2.7 -> 6.2.8 2023-03-23 08:25:49 +01:00
Maximilian Bosch
25ee2ea037
linux: 6.1.20 -> 6.1.21 2023-03-23 08:25:34 +01:00
Maximilian Bosch
8d7db2427d
linux: 5.4.237 -> 5.4.238 2023-03-23 08:25:22 +01:00
Maximilian Bosch
609bd9bcee
linux: 5.15.103 -> 5.15.104 2023-03-23 08:25:12 +01:00
Maximilian Bosch
db9b3233fc
linux: 5.10.175 -> 5.10.176 2023-03-23 08:25:00 +01:00
Maximilian Bosch
72cd47a8c1
linux: 4.19.278 -> 4.19.279 2023-03-23 08:24:49 +01:00
Maximilian Bosch
2dff193f3d
linux: 4.14.310 -> 4.14.311 2023-03-23 08:24:37 +01:00
Phil Dyer
4b8b50fed7 tuxedo-keyboard: fix building of tuxedo-keyboard kernel module 2023-03-23 15:44:01 +10:00
R. Ryantm
5c305b5a8f checkpolicy: 3.3 -> 3.5 2023-03-23 04:42:32 +00:00
github-actions[bot]
b40dc62b5f
Merge staging-next into staging 2023-03-22 18:01:48 +00:00
github-actions[bot]
85f7b5276e
Merge master into staging-next 2023-03-22 18:01:11 +00:00
7c6f434c
5706ae4934
Merge pull request #222156 from Mic92/sysdig
sysdig: 0.30.2 -> 0.31.3
2023-03-22 13:32:03 +00:00
github-actions[bot]
cbf5275c3e
Merge staging-next into staging 2023-03-22 00:02:56 +00:00
github-actions[bot]
209875d860
Merge master into staging-next 2023-03-22 00:02:03 +00:00
github-actions[bot]
8395940ab9
Merge staging-next into staging 2023-03-21 18:01:44 +00:00
github-actions[bot]
797a2b9bcc
Merge master into staging-next 2023-03-21 18:01:07 +00:00
arcnmx
c448edd408 nvme-cli: meta.mainProgram 2023-03-21 10:09:06 -07:00
ajs124
d2bae8a116
Merge pull request #222329 from helsinki-systems/upd/nftables
nftables: 1.0.6 -> 1.0.7
2023-03-21 15:07:21 +01:00
Alyssa Ross
fedc983734 linuxManualConfig: add pahole to moduleBuildDependencies
This seems to be needed for out-of-tree module builds since d57568fcad.
We do not yet understand why, but this will unblock the channels while
we figure it out.

Fixes: d57568fcad ("linuxManualConfig: install GDB scripts")
2023-03-21 12:40:16 +00:00
Vladimír Čunát
0a88dec4f3
Merge branch 'staging-next' into staging 2023-03-21 12:57:16 +01:00
ajs124
b17e280afe nftables: 1.0.6 -> 1.0.7
https://www.spinics.net/lists/netfilter/msg61018.html
2023-03-21 11:46:33 +01:00
github-actions[bot]
bb48723d63
Merge master into staging-next 2023-03-21 00:02:39 +00:00
Maximilian Bosch
e999433b3a
Merge pull request #221707 from NixOS/linuxManualConfig-unpack
linuxManualConfig: install GDB scripts
2023-03-20 20:42:10 +01:00
github-actions[bot]
75c28ec351
Merge master into staging-next 2023-03-20 18:01:16 +00:00
Franz Pletz
3790924e90
Merge pull request #222183 from PedroHLC/zen-kernels-6.2.7 2023-03-20 15:14:18 +01:00
Martin Weinelt
9959ec97f8
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/wxPython/4.0.nix
- pkgs/development/python-modules/wxPython/4.1.nix
2023-03-20 15:07:36 +01:00
PedroHLC ☭
acde26c95a
linuxKernel.kernels.linux_lqx: 6.2.6-lqx1 -> 6.2.7-lqx1 2023-03-20 09:32:03 -03:00
PedroHLC ☭
4678ba6454
linuxKernel.kernels.linux_zen: 6.2.6-zen1 -> 6.2.7-zen1 2023-03-20 09:30:21 -03:00
Alyssa Ross
663caaa684 linux_testing_bcachefs: mark broken on aarch64 2023-03-20 12:28:48 +00:00
Alyssa Ross
cdd6211abb linux_testing_bcachefs: fix meta
kernel.override overrides the invocation of buildLinux, not the
function in the file that defines the specific kernel version, so we
need to pass the arguments that buildLinux expects.
2023-03-20 12:28:48 +00:00
Jörg Thalheim
a06e5ea365 sysdig: 0.30.2 -> 0.31.3 2023-03-20 10:04:01 +01:00
Alyssa Ross
d57568fcad
linuxManualConfig: install GDB scripts
These are required to debug kernel modules.  Since we're now able to
do that, there's another reason besides BTF to enable DEBUG_INFO, so
I've done that for pre-BTF kernel modules as well here.

For GDB to get configured correctly, vmlinux-gdb.py has to be two
directories up from scripts/gdb, and vmlinux has to be next to
vmlinux-gdb.py.  The least invasive way to satisfy these constraints
is to make vmlinux a symlink, which GDB will resolve before looking
for vmlinux-gdb.py.

Tested both ways of getting the scripts into GDB that I know of:

gdb /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/vmlinux \
    -iex 'add-auto-load-safe-path /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/lib/modules/6.1.19/build/vmlinux-gdb.py' \
    -ex 'lx-version' \
    -ex 'q'
gdb /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/vmlinux \
    -ex 'source /nix/store/7n77ijlxkxr6d613h02lr707kvjx6j1k-linux-6.1.19-dev/lib/modules/6.1.19/build/vmlinux-gdb.py' \
    -ex 'lx-version' \
    -ex 'q'

Also tested that the strip changes don't result in meaningful output
size changes (there's some small variation due to BTF data not always
coming out the same size, which is unrelated), and built every kernel
I can on x86_64 to make sure I'm not relying on build system behaviour
specific to newer kernels.
2023-03-20 00:09:52 +00:00
github-actions[bot]
96f7385465
Merge master into staging-next 2023-03-20 00:02:29 +00:00
Alyssa Ross
41f788b121
linuxManualConfig: use the default make target
We've basically been reimplementing this — by default it contains
vmlinux, dtbs (on applicable architectures), modules, and architecture
specific stuff like $(KBUILD_IMAGE) and a couple of other
miscellaneous files.
2023-03-19 23:55:12 +00:00
Alyssa Ross
7de3f08ce3
linuxManualConfig: unpack directly into $dev
linux is unusual in that we include its sources in an output.  There's
no point unpacking into /build when we're going to copy the sources
into $dev later.  Let's unpack directly into the final destination of
the code, and save copying a whole kernel source tree (often across
filesystems!).

This also means that Kbuild knows the location of the sources, which
will allow us to install the GDB scripts — some scripts are generated,
and some are not, so the generated ones end up in the build directory,
accompanied by symlinks to the non-generated ones in the source
directory.
2023-03-19 23:54:19 +00:00
Sandro
d8755c55b4
Merge pull request #219911 from MakiseKurisu/master 2023-03-19 22:51:01 +01:00