!44 跟进openEuler(5.10.0-4.9.0)和树莓派内核更新，bugfix:设备树拷贝不全/内核编译设置版本号

From: @woqidaideshi
Reviewed-by: @jianminw
Signed-off-by: @jianminw

README.en.md

@@ -16,10 +16,10 @@ AArch64
 
 #### Instructions
 
-1. The version of raspberrypi kernel is in the front of `.raspi.aarch64` such as `4.19.90-2005.2.0.0001.raspi.aarch64`.
-2. The module files will be installed into `/lib/modules/` such as `/lib/modules/4.19.90-2005.2.0.0001.raspi.aarch64`, where `4.19.90-2005.2.0.0039.raspi` is the version of raspberrypi kernel.
-3. The image file will be installed into `/boot/` such as `/boot/vmlinuz-4.19.90-2005.2.0.0001.raspi.aarch64`. Meanwhile, the `/boot/kernel8.img` will be overrided by the image file.
-4. The device tree files will be installed into `/boot/` such as `/boot/dtb-4.19.90-2005.2.0.0001.raspi.aarch64`. Meanwhile, the `.dtb` files and `overlays` folder in this `dtb-4.19.90-2005.2.0.0001.raspi.aarch64` directory will replace the corresponding files in `/boot/`.
+1. The version of raspberrypi kernel is in the front of `.raspi.aarch64` such as `5.10.0-4.0.0.1.raspi.aarch64`.
+2. The module files will be installed into `/lib/modules/` such as `/lib/modules/5.10.0-4.0.0.1.raspi.aarch64`, where `5.10.0-4.0.0.1.raspi` is the version of raspberrypi kernel.
+3. The image file will be installed into `/boot/` such as `/boot/vmlinuz-5.10.0-4.0.0.1.raspi.aarch64`. Meanwhile, the `/boot/kernel8.img` will be overrided by the image file.
+4. The device tree files will be installed into `/boot/` such as `/boot/dtb-5.10.0-4.0.0.1.raspi.aarch64`. Meanwhile, the `.dtb` files and `overlays` folder in this `dtb-5.10.0-4.0.0.1.raspi.aarch64` directory will replace the corresponding files in `/boot/`.
 
 
 

README.md

@@ -18,10 +18,10 @@ AArch64
 
 安装 raspberrypi-kernel 后，
 
-1. 内核版本号后缀增加 `.raspi` 标识，形如 `4.19.90-2005.2.0.0001.raspi.aarch64`。
-2. 内核模块安装在 `/lib/modules/` 目录下，对应文件夹名称同内核版本号，如 `4.19.90-2005.2.0.0001.raspi.aarch64`。
-3. 内核映像文件在 `/boot/` 目录下，映像文件名形如 `vmlinuz-4.19.90-2005.2.0.0001.raspi.aarch64`。同时，该文件会替换原来的 `/boot/kernel8.img` 文件。
-4. 设备树文件在 `/boot/` 目录下的文件夹下，该文件夹名称形如 `dtb-4.19.90-2005.2.0.0001.raspi.aarch64`。同时，该文件夹下的 `.dtb` 文件和 `overlays` 文件夹会替换 `/boot/` 下对应的文件。
+1. 内核版本号后缀增加 `.raspi` 标识，形如 `5.10.0-4.0.0.1.raspi.aarch64`。
+2. 内核模块安装在 `/lib/modules/` 目录下，对应文件夹名称同内核版本号，如 `5.10.0-4.0.0.1.raspi.aarch64`。
+3. 内核映像文件在 `/boot/` 目录下，映像文件名形如 `vmlinuz-5.10.0-4.0.0.1.raspi.aarch64`。同时，该文件会替换原来的 `/boot/kernel8.img` 文件。
+4. 设备树文件在 `/boot/` 目录下的文件夹下，该文件夹名称形如 `dtb-5.10.0-4.0.0.1.raspi.aarch64`。同时，该文件夹下的 `.dtb` 文件和 `overlays` 文件夹会替换 `/boot/` 下对应的文件。
 
 #### 参与贡献
 

raspberrypi-kernel.spec

@@ -2,17 +2,17 @@
 
 %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
 
-%global hulkrelease 2009.4.1
+%global hulkrelease 4.9.0
 
 %global debug_package %{nil}
 
 Name:	 raspberrypi-kernel
-Version: 4.19.140
-Release: %{hulkrelease}.0002
+Version: 5.10.0
+Release: %{hulkrelease}.4
 Summary: Linux Kernel
-License: GPLv2
+License: GPLv2 and Apache-2.0 and MIT
 URL:	 http://www.kernel.org/
-Source0: https://gitee.com/openeuler/raspberrypi-kernel/repository/archive/%{version}-%{hulkrelease}.tar.gz
+Source0: https://gitee.com/openeuler/kernel/repository/archive/%{version}-%{hulkrelease}.tar.gz
 
 BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar
 BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
@@ -24,7 +24,7 @@ BuildRequires: hmaccalc
 BuildRequires: ncurses-devel
 BuildRequires: elfutils-libelf-devel
 BuildRequires: rpm >= 4.14.2
-BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) bison
+BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison
 BuildRequires: audit-libs-devel
 BuildRequires: pciutils-devel gettext
 BuildRequires: rpm-build, elfutils
@@ -43,7 +43,7 @@ The Linux Kernel image for RaspberryPi.
 
 %prep
 %setup -q -n kernel-%{version} -c
-mv %{name} linux-%{version}
+mv kernel linux-%{version}
 cp -rl linux-%{version} linux-%{KernelVer}
 
 cd linux-%{KernelVer}
@@ -56,9 +56,9 @@ cd linux-%{KernelVer}
 
 perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.raspi.%{_target_cpu}/" Makefile
 
-make ARCH=%{Arch} %{?_smp_mflags} openeuler-raspi_defconfig
+make ARCH=%{Arch} %{?_smp_mflags} bcm2711_defconfig
 
-make ARCH=%{Arch} %{?_smp_mflags}
+make ARCH=%{Arch} %{?_smp_mflags} KERNELRELEASE=%{KernelVer}
 
 %install
 cd linux-%{KernelVer}
@@ -78,6 +78,9 @@ install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-%{KernelVer}
 mkdir -p $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays
 install -m 644 $(find arch/%{Arch}/boot/dts/broadcom/ -name "*.dtb") $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/
 install -m 644 $(find arch/%{Arch}/boot/dts/overlays/ -name "*.dtbo") $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/
+if ls arch/%{Arch}/boot/dts/overlays/*.dtb > /dev/null 2>&1; then
+    install -m 644 $(find arch/%{Arch}/boot/dts/overlays/ -name "*.dtb") $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/
+fi
 install -m 644 arch/%{Arch}/boot/dts/overlays/README $RPM_BUILD_ROOT/boot/dtb-%{KernelVer}/overlays/
 
 %postun
@@ -119,6 +122,9 @@ if [ "$version_old" != "0" ]; then
                     fi
                 done
                 install -m 644 $(find /boot/dtb-$version_old/overlays/ -name "*.dtbo") /boot/overlays/
+                if ls /boot/dtb-$version_old/overlays/*.dtb > /dev/null 2>&1; then
+                    install -m 644 $(find /boot/dtb-$version_old/overlays/ -name "*.dtb") /boot/overlays/
+                fi
                 install -m 644 /boot/dtb-$version_old/overlays/README /boot/overlays/
             else
                 echo "warning: files in /boot/dtb-$version_old/*.dtb missing when resetting kernel as $version_old, something may go wrong when starting this device next time."
@@ -150,6 +156,9 @@ do
     fi
 done
 install -m 644 $(find /boot/dtb-%{KernelVer}/overlays/ -name "*.dtbo") /boot/overlays/
+if ls /boot/dtb-%{KernelVer}/overlays/*.dtb > /dev/null 2>&1; then
+    install -m 644 $(find /boot/dtb-%{KernelVer}/overlays/ -name "*.dtb") /boot/overlays/
+fi
 install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
 
 
@@ -163,23 +172,16 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
 /lib/modules/%{KernelVer}
 
 %changelog
-* Tue Nov 10 2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.140-2009.4.1.0002
-- update to the latest kernel version(4.19.127) of raspberrypi upstream kernel
+* Tue Mar 9  2021 Yafen Fang<yafen@iscas.ac.cn> - 5.10.0-4.9.0.4
+- update kernel version to openEuler 5.10.0-4.9.0
 
-* Fri Sep 25 2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.140-2009.4.0.0001
-- Update kernel version to 4.19.140-2009.4.0.
+* Thu Mar 4  2021 Yafen Fang<yafen@iscas.ac.cn> - 5.10.0-4.7.0.3
+- update kernel version to openEuler 5.10.0-4.7.0 (change source0 to openeuler/kernel)
+- apply patches of Raspberry Pi (commits from f45e8420c8d3a12837817a5de5985af2e95757d6 to ec967eb45f8d4ed59bebafb5748da38118383be7)
 
-* Wed Sep 16 2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.140-2009.2.0.0001
-- Update kernel version to 4.19.140-2009.2.0.
+* Fri Feb 26 2021 Yafen Fang<yafen@iscas.ac.cn> - 5.10.0-4.3.1.2
+- update kernel version to openEuler 5.10.0-4.3.0
+- apply patches of Raspberry Pi (commits from 5cd836735908ba0e2ad6f65d9b3f40eaa8253842 to 12fdeddcde1ce67177ae0e13931ff24944015625)
 
-* Wed Sep 2  2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.140-2008.3.0.0001
-- Update kernel version to 4.19.140-2008.3.0.
-
-* Tue Aug 18 2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.138-2008.1.0.0001
-- Update kernel version to 4.19.138-2008.1.0.
-
-* Tue Jul 21 2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.90-2005.2.0.0002
-- Override old files in /boot.
-
-* Tue Jul 7  2020 Yafen Fang<yafen@iscas.ac.cn> - 4.19.90-2005.2.0.0001
-- Add spec file to generate RaspberryPi kernel image rpm.
+* Mon Feb 22 2021 Yafen Fang<yafen@iscas.ac.cn> - 5.10.0-4.0.0.1
+- update kernel version to openEuler 5.10.0-4.0.0