update rpi-rt to 5.10.0-161.0.0.10 && kernel-rt to 5.10.0-164.0.0.60

This commit is contained in:
zhangyu 2023-10-31 15:41:59 +08:00
parent a52a1e52f3
commit df4bedc9b7
4 changed files with 790 additions and 1014 deletions

File diff suppressed because it is too large Load Diff

34
0003-rpi4-extern.patch Normal file
View File

@ -0,0 +1,34 @@
From 7f99ea180efb5d8fa80af772428c9f00de991773 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn>
Date: Tue, 31 Oct 2023 11:22:42 +0800
Subject: [PATCH] rpi4-extern
---
arch/arm64/kernel/fpsimd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index 84520f116..aa631771e 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -180,7 +180,7 @@ static void __get_cpu_fpsimd_context(void)
*/
static void get_cpu_fpsimd_context(void)
{
- local_bh_disable();
+ preempt_disable();
__get_cpu_fpsimd_context();
}
@@ -201,7 +201,7 @@ static void __put_cpu_fpsimd_context(void)
static void put_cpu_fpsimd_context(void)
{
__put_cpu_fpsimd_context();
- local_bh_enable();
+ preempt_enable();
}
static bool have_cpu_fpsimd_context(void)
--
2.25.1

View File

@ -10,9 +10,9 @@
%global upstream_version 5.10 %global upstream_version 5.10
%global upstream_sublevel 0 %global upstream_sublevel 0
%global devel_release 146 %global devel_release 161
%global maintenance_release .0.0 %global maintenance_release .0.0
%global pkg_release .59 %global pkg_release .60
%global rt_release .rt62 %global rt_release .rt62
%define with_debuginfo 1 %define with_debuginfo 1
@ -52,7 +52,12 @@ Source0: kernel.tar.gz
Source10: sign-modules Source10: sign-modules
Source11: x509.genkey Source11: x509.genkey
Source12: extra_certificates Source12: extra_certificates
Source13: pubring.gpg # openEuler RPM PGP certificates:
# 1. openeuler <openeuler@compass-ci.com>
Source13: RPM-GPG-KEY-openEuler-compass-ci
# 2. private OBS <defaultkey@localobs>
Source14: RPM-GPG-KEY-openEuler-localobs
Source15: process_pgp_certs.sh
%if 0%{?with_kabichk} %if 0%{?with_kabichk}
Source18: check-kabi Source18: check-kabi
@ -886,6 +891,8 @@ fi
%endif %endif
%changelog %changelog
* Mon Nov 1 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-161.0.0.60
- update kernel-rt version to 5.10.0-161.0.0
* Wed Apr 10 2023 liyulei <liyulei@kylinos.cn> - 5.10.0-146.0.0.59 * Wed Apr 10 2023 liyulei <liyulei@kylinos.cn> - 5.10.0-146.0.0.59
- update kernel-rt version to 5.10.0-146.0.0 - update kernel-rt version to 5.10.0-146.0.0

View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu} %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 126.0.0 %global hulkrelease 161.0.0
%global debug_package %{nil} %global debug_package %{nil}
Name: raspberrypi-kernel-rt Name: raspberrypi-kernel-rt
Version: 5.10.0 Version: 5.10.0
Release: %{hulkrelease}.rt62.9 Release: %{hulkrelease}.rt62.10
Summary: Linux Kernel Summary: Linux Kernel
License: GPLv2 License: GPLv2
URL: http://www.kernel.org/ URL: http://www.kernel.org/
@ -16,6 +16,7 @@ Source0: kernel.tar.gz
Patch0000: 0000-raspberrypi-kernel.patch Patch0000: 0000-raspberrypi-kernel.patch
Patch0001: 0001-apply-preempt-RT-patch.patch Patch0001: 0001-apply-preempt-RT-patch.patch
Patch0002: 0002-modify-bcm2711_defconfig-for-rt-rpi-kernel.patch Patch0002: 0002-modify-bcm2711_defconfig-for-rt-rpi-kernel.patch
Patch0003: 0003-rpi4-extern.patch
BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar
BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
@ -53,6 +54,7 @@ cd linux-%{KernelVer}
%patch0000 -p1 %patch0000 -p1
%patch0001 -p1 %patch0001 -p1
%patch0002 -p1 %patch0002 -p1
%patch0003 -p1
find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
find . -name .gitignore -exec rm -f {} \; >/dev/null find . -name .gitignore -exec rm -f {} \; >/dev/null
@ -170,6 +172,9 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
/lib/modules/%{KernelVer} /lib/modules/%{KernelVer}
%changelog %changelog
* Mon Dec 30 2023 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-161.0.0.10
- - update preempt-RT to openEuler 5.10.0-161.0.0
* Mon Nov 20 2022 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-126.0.0.9 * Mon Nov 20 2022 zhangyu <zhangyu4@kylinos.cn> - 5.10.0-126.0.0.9
- - update preempt-RT to openEuler 5.10.0-126.0.0 - - update preempt-RT to openEuler 5.10.0-126.0.0