packages/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'openEuler-24.03-LTS' of https://gitee.com/src-openeuler/kernel into openEuler-24.03-LTS-Next

Browse Source 
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>
This commit is contained in:
ZhangPeng 2024-10-30 15:19:09 +08:00
commit e7e5850c6b
19 changed files with 544973 additions and 37207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128007
0000-raspberrypi-kernel.patch
View File

File diff suppressed because it is too large Load Diff

15673
0001-raspberrypi-kernel-RT.patch Normal file
View File

File diff suppressed because it is too large Load Diff

367541
0001-riscv-kernel.patch Normal file
View File

File diff suppressed because it is too large Load Diff

33
0002-modify-bcm2711_defconfig-for-rt-rpi-kernel.patch Normal file
View File

@ -0,0 +1,33 @@
From aaf0e5b79782b0928ffd7b0feec770f1961daf4d Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn>
Date: Wed, 15 May 2024 11:38:14 +0800
Subject: [PATCH] rt2
---
arch/arm64/configs/bcm2711_defconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
index 6ac8c83f6..140cc175d 100644
--- a/arch/arm64/configs/bcm2711_defconfig
+++ b/arch/arm64/configs/bcm2711_defconfig
@@ -8,6 +8,7 @@ CONFIG_HIGH_RES_TIMERS=y
CONFIG_BPF_SYSCALL=y
CONFIG_BPF_JIT=y
CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT=y/
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
@@ -62,7 +63,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
CONFIG_CPUFREQ_DT=y
CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
-CONFIG_VIRTUALIZATION=y
+#CONFIG_VIRTUALIZATION is not set
CONFIG_KVM=y
CONFIG_JUMP_LABEL=y
CONFIG_MODULES=y
--
2.41.0

13472
0005-haoc-kernel.patch Normal file
View File

File diff suppressed because it is too large Load Diff

2252
Module.kabi_aarch64
View File

File diff suppressed because it is too large Load Diff

2177
Module.kabi_x86_64
View File

File diff suppressed because it is too large Load Diff

2
SOURCE
View File

@ -1 +1 @@
6.6.0-16.0.0
6.6.0-48.0.0

4
_multibuild Normal file
View File

@ -0,0 +1,4 @@
<multibuild>
<flavor>raspberrypi-kernel</flavor>
<flavor>haoc-kernel</flavor>
</multibuild>

10
check-kabi
View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
#
# check-kabi - Red Hat kABI reference checking tool
#
@ -41,7 +41,7 @@ def load_symvers(symvers,filename):
break
if in_line == "\n":
continue
checksum,symbol,directory,type = in_line.split()
checksum,symbol,directory,type,namespace = in_line.split('\t')
symvers[symbol] = in_line[0:-1]
@ -56,7 +56,7 @@ def load_kabi(kabi,filename):
break
if in_line == "\n":
continue
checksum,symbol,directory,type = in_line.split()
checksum,symbol,directory,type,namespace = in_line.split('\t')
kabi[symbol] = in_line[0:-1]
@ -71,9 +71,9 @@ def check_kabi(symvers,kabi):
losted_symbols=[]
for symbol in kabi:
abi_hash,abi_sym,abi_dir,abi_type = kabi[symbol].split()
abi_hash,abi_sym,abi_dir,abi_type,abi_namespace = kabi[symbol].split('\t')
if symbol in symvers:
sym_hash,sym_sym,sym_dir,sym_type = symvers[symbole].split()
sym_hash,sym_sym,sym_dir,sym_type,sym_namespace = symvers[symbol].split('\t')
if abi_hash != sym_hash:
fail=1
changed_symbols.append(symbol)

10943
haoc-kernel.spec Normal file
View File

File diff suppressed because it is too large Load Diff

1647
kabi_whitelist_aarch64 Normal file
View File

File diff suppressed because it is too large Load Diff

1730
kabi_whitelist_x86_64 Normal file
View File

File diff suppressed because it is too large Load Diff

10620
kernel-rt.spec Normal file
View File

File diff suppressed because it is too large Load Diff

9316
kernel.spec
View File

File diff suppressed because it is too large Load Diff

15673
patch-6.6.0-6.0.0-rt20.patch Normal file
View File

File diff suppressed because it is too large Load Diff

71
patch-6.6.0-6.0.0-rt20.patch-openeuler_defconfig.patch Normal file
View File

@ -0,0 +1,71 @@
From cb6750f16a7d1d5074b0f7c46270014dd348a958 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu4@kylinos.cn>
Date: Tue, 21 May 2024 14:50:20 +0800
Subject: [PATCH] rt2
---
arch/arm64/configs/openeuler_defconfig | 4 ++--
arch/x86/configs/openeuler_defconfig | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/configs/openeuler_defconfig b/arch/arm64/configs/openeuler_defconfig
index 3b8d78f94..6c7e6f2f9 100644
--- a/arch/arm64/configs/openeuler_defconfig
+++ b/arch/arm64/configs/openeuler_defconfig
@@ -97,7 +97,7 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_DYNAMIC is not set
-
+CONFIG_PREEMPT_RT=y
#
# CPU/Task time and stats accounting
#
@@ -755,7 +755,7 @@ CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
CONFIG_KVM_HISI_VIRT=y
-CONFIG_VIRTUALIZATION=y
+#CONFIG_VIRTUALIZATION is not set
CONFIG_KVM=y
CONFIG_CVM_HOST=y
# CONFIG_NVHE_EL2_DEBUG is not set
diff --git a/arch/x86/configs/openeuler_defconfig b/arch/x86/configs/openeuler_defconfig
index 9b5df8585..ece62e3df 100644
--- a/arch/x86/configs/openeuler_defconfig
+++ b/arch/x86/configs/openeuler_defconfig
@@ -112,11 +112,11 @@ CONFIG_BPF_SCHED=y
# end of BPF subsystem
CONFIG_PREEMPT_NONE_BUILD=y
-CONFIG_PREEMPT_NONE=y
+#CONFIG_PREEMPT_NONE is not set
# CONFIG_PREEMPT_VOLUNTARY is not set
# CONFIG_PREEMPT is not set
# CONFIG_PREEMPT_DYNAMIC is not set
-
+CONFIG_PREEMPT_RT=y
#
# CPU/Task time and stats accounting
#
@@ -248,7 +248,7 @@ CONFIG_SYSCTL=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
-# CONFIG_EXPERT is not set
+CONFIG_EXPERT=y
CONFIG_UID16=y
CONFIG_MULTIUSER=y
CONFIG_SGETMASK_SYSCALL=y
@@ -744,7 +744,7 @@ CONFIG_HAVE_KVM_NO_POLL=y
CONFIG_KVM_XFER_TO_GUEST_WORK=y
CONFIG_HAVE_KVM_PM_NOTIFIER=y
CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y
-CONFIG_VIRTUALIZATION=y
+# CONFIG_VIRTUALIZATION is not set
CONFIG_KVM=m
CONFIG_KVM_INTEL=m
CONFIG_X86_SGX_KVM=y
--
2.41.0

2892
raspberrypi-kernel-rt.spec Normal file
View File

File diff suppressed because it is too large Load Diff

117
raspberrypi-kernel.spec
View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 95.0.0
%global hulkrelease 28.0.0
%global debug_package %{nil}
Name: raspberrypi-kernel
Version: 5.10.0
Release: %{hulkrelease}.8
Version: 6.6.0
Release: %{hulkrelease}.5
Summary: Linux Kernel
License: GPLv2
URL: http://www.kernel.org/
@ -42,6 +42,17 @@ ExclusiveOS: Linux
%description
The Linux Kernel image for RaspberryPi.
%package devel
Summary: Development package for building kernel modules to match the %{KernelVer} raspberrypi-kernel
AutoReqProv: no
Provides: raspberrypi-kernel-devel-uname-r = %{KernelVer}
Provides: raspberrypi-kernel-devel-%{_target_cpu} = %{version}-%{release}
Requires: perl findutils
%description devel
This package provides raspberrypi kernel headers and makefiles sufficient to build modules
against the %{KernelVer} raspberrypi-kernel package.
%prep
%setup -q -n kernel-%{version} -c
mv kernel linux-%{version}
@ -85,6 +96,70 @@ if ls arch/%{Arch}/boot/dts/overlays/*.dtb > /dev/null 2>&1; then
fi
install -m 644 arch/%{Arch}/boot/dts/overlays/README $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/
mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build
############ to do collect devel file #########
# 1. Makefile And Kconfig, .config sysmbol
# 2. scrpits dir
# 3. .h file
find -type f \( -name "Makefile*" -o -name "Kconfig*" \) -exec cp --parents {} $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build \;
for f in Module.symvers System.map Module.markers .config;do
test -f $f || continue
cp $f $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build
done
cp -a scripts $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build
if [ -d arch/%{Arch}/scripts ]; then
cp -a arch/%{Arch}/scripts $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/arch/%{_arch} || :
fi
if [ -f arch/%{Arch}/*lds ]; then
cp -a arch/%{Arch}/*lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/arch/%{_arch}/ || :
fi
find $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/scripts/ -name "*.o" -exec rm -rf {} \;
if [ -d arch/%{Arch}/include ]; then
cp -a --parents arch/%{Arch}/include $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/
fi
cp -a include $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include
if [ -f arch/%{Arch}/kernel/module.lds ]; then
cp -a --parents arch/%{Arch}/kernel/module.lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/
fi
# module.lds is moved to scripts by commit 596b0474d3d9 in linux 5.10.
if [ -f scripts/module.lds ]; then
cp -a --parents scripts/module.lds $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/
fi
%ifarch aarch64
cp -a --parents arch/arm/include/asm $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/
%endif
# copy objtool for raspberrypi-kernel-devel (needed for building external modules)
if grep -q CONFIG_STACK_VALIDATION=y .config; then
mkdir -p $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool
cp -a tools/objtool/objtool $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/tools/objtool
fi
# Make sure the Makefile and version.h have a matching timestamp so that
# external modules can be built
touch -r $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/Makefile $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/generated/uapi/linux/version.h
touch -r $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/.config $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/generated/autoconf.h
# for make prepare
if [ ! -f $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/config/auto.conf ];then
cp .config $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build/include/config/auto.conf
fi
mkdir -p %{buildroot}/usr/src/kernels
mv $RPM_BUILD_ROOT/lib/modules/%{KernelVer}/build $RPM_BUILD_ROOT/usr/src/kernels/%{KernelVer}
find $RPM_BUILD_ROOT/usr/src/kernels/%{KernelVer} -name ".*.cmd" -exec rm -f {} \;
pushd $RPM_BUILD_ROOT/lib/modules/%{KernelVer}
ln -sf /usr/src/kernels/%{KernelVer} build
ln -sf build source
popd
%postun
version_old=0
if [ "$1" == "0" ]; then
@ -155,6 +230,18 @@ if ls /boot/dtb-%{KernelVer}/overlays/*.dtb > /dev/null 2>&1; then
fi
install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
%post devel
if [ -f /etc/sysconfig/kernel ]
then
. /etc/sysconfig/kernel || exit $?
fi
if [ "$HARDLINK" != "no" -a -x /usr/sbin/hardlink ]
then
(cd /usr/src/kernels/%{KernelVer} &&
/usr/bin/find . -type f | while read f; do
hardlink -c /usr/src/kernels/*.oe*.*/$f $f
done)
fi
%files
%defattr (-, root, root)
@ -165,7 +252,31 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
/boot/dtb-*
/lib/modules/%{KernelVer}
%files devel
%defattr (-, root, root)
%doc
/lib/modules/%{KernelVer}/source
/lib/modules/%{KernelVer}/build
/usr/src/kernels/%{KernelVer}
%changelog
* Wed May 29 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-28.0.0.5
- update kernel version to openEuler 6.6.0-28.0.0
* Wed May 15 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-26.0.0.4
- update kernel version to openEuler 6.6.0-26.0.0
- update Raspberry Pi patch, last commit (abc50146600eb2cb93aec321d003970296950343): staging: bcm2835-codec: 32bpp RGB formats need a 64byte alignment
* Fri May 10 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-25.0.0.3
- update kernel version to openEuler 6.6.0-25.0.0
* Thu Apr 25 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-22.0.0.2
- add subpackage raspberrypi-kernel-devel
- update kernel version to openEuler 6.6.0-22.0.0
* Wed Apr 17 2024 Yafen Fang <yafen@iscas.ac.cn> - 6.6.0-19.0.0.1
- update kernel version to openEuler 6.6.0-19.0.0
* Mon May 30 2022 Yafen Fang <yafen@iscas.ac.cn> - 5.10.0-95.0.0.8
- update kernel version to openEuler 5.10.0-95.0.0