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

Signed-off-by: Amjac <liuzhh@zgclab.edu.cn>

SOURCE

@@ -1 +1 @@
-6.6.0-13.0.0
+6.6.0-24.0.0

_multibuild

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

openeuler_kernel_cert.cer

@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+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
+/V6mKr3gR8aQytJy+1JBXKzjyw==
+-----END CERTIFICATE-----

raspberrypi-kernel.spec

@@ -2,13 +2,13 @@
 
 %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
 
-%global hulkrelease 95.0.0
+%global hulkrelease 22.0.0
 
 %global debug_package %{nil}
 
 Name:	 raspberrypi-kernel
-Version: 5.10.0
+Version: 6.6.0
-Release: %{hulkrelease}.8
+Release: %{hulkrelease}.2
 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,21 @@ 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
+* Thu Apr 25 2024 heppen <hepeng68@huawei.com> - 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
 

sign-modules-openeuler

@@ -0,0 +1,32 @@
+#! /bin/bash
+
+sign_module()
+{
+    sh /usr/lib/rpm/brp-ebs-sign --module $1 &> /dev/null
+    mv $1.sig $1
+}
+
+sign_module_list()
+{
+    IFS=$'\n'
+    for m in $1; do
+        sign_module $m &
+    done
+    wait
+}
+
+moddir=$1
+find $moddir -name *.ko > module_openeuler_unsign.list
+row_num=`wc -l module_openeuler_unsign.list | awk '{print $1}'`
+for((i=1;i<$row_num;i+=10)); do
+    IFS=""
+    sign_module_list $(sed -n "$i,$((i+9))p" module_openeuler_unsign.list)
+done
+
+RANDOMMOD=$(find $moddir -type f -name '*.ko' | sort -R | tail -n 1)
+if [ "~Module signature appended~" != "$(tail -c 28 $RANDOMMOD)" ]; then
+	echo "*** Modules are unsigned! ***"
+	exit 1
+fi
+
+exit 0