Skip to content

Commit 11555b4

Browse files
committed
Fix build, use new kernel, remove 0001-block-Relax-a-check-in-blk_start_queue.patch which is not needed
1 parent a19c55f commit 11555b4

File tree

4 files changed

+5
-58
lines changed

4 files changed

+5
-58
lines changed

src/config

100644100755
File mode changed.

src/modules/realtimepi/config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ export KERNEL_CONFIG_APPEND="CONFIG_PREEMPT_RT_FULL=y
33
CONFIG_DEBUG_PREEMPT=n
44
CONFIG_PREEMPT_TRACER=n
55
CONFIG_RCU_CPU_STALL_TIMEOUT=21"
6-
export KERNEL_COMMIT=aedca583da8bbf5fbd6fdf9ac90d0ad3d2f88ec2
6+
export KERNEL_COMMIT=d5a3b4cab0c8eacc93e58cfa1bdbd259399caedd
7+
export REALTIMEPI_RTPATCH=https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.68-rt60.patch.xz
78
# git ls-remote https://github.com/raspberrypi/linux.git | grep rpi-4.9.y | grep -v rebase | head -n 1

src/modules/realtimepi/filesystem/home/pi/patches/0001-block-Relax-a-check-in-blk_start_queue.patch

Lines changed: 0 additions & 54 deletions
This file was deleted.

src/modules/realtimepi/start_chroot_script

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ unpack /filesystem/home/pi /home/pi pi
1616
pushd /home/pi
1717

1818
# realtime patch
19-
wget https://www.kernel.org/pub/linux/kernel/projects/rt/4.9/patch-4.9.47-rt37.patch.xz
19+
wget "${REALTIMEPI_RTPATCH}"
2020

2121
pushd linux
2222
# Patch for usb-dwc_otg-fix with fix, see https://www.osadl.org/Single-View.111+M5c03315dc57.0.html
2323
patch -p1 < /home/pi/patches/0001-usb-dwc_otg-fix-system-lockup-when-interrupts-are-th.patch
2424
# Revert a patch that clashes
25-
patch -p1 -R < /home/pi/patches/0001-block-Relax-a-check-in-blk_start_queue.patch
26-
xzcat ../patch-4.9.47-rt37.patch.xz | patch -p1
25+
# patch -p1 -R < /home/pi/patches/0001-block-Relax-a-check-in-blk_start_queue.patch
26+
xzcat ../$(basename "${REALTIMEPI_RTPATCH}") | patch -p1
2727

2828
popd
2929
popd

0 commit comments

Comments
 (0)