From 67d12128c81ff9664897bdcef2775f25d2634e47 Mon Sep 17 00:00:00 2001 From: yafen Date: Fri, 5 Mar 2021 10:47:33 +0800 Subject: [PATCH 1/3] update to openEuler 4.19.90-2102.3.0 --- raspberrypi-kernel.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index ec6b3fb..8f44dbd 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -2,13 +2,13 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 2101.1.0 +%global hulkrelease 2102.3.0 %global debug_package %{nil} Name: raspberrypi-kernel Version: 4.19.90 -Release: %{hulkrelease}.0014 +Release: %{hulkrelease}.0015 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ @@ -58,7 +58,7 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.raspi.%{_target_cpu} make ARCH=%{Arch} %{?_smp_mflags} openeuler-raspi_defconfig -make ARCH=%{Arch} %{?_smp_mflags} +make ARCH=%{Arch} %{?_smp_mflags} KERNELRELEASE=%{KernelVer} %install cd linux-%{KernelVer} @@ -163,6 +163,9 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/ /lib/modules/%{KernelVer} %changelog +* Fri Mar 5 2021 Yafen Fang - 4.19.90-2102.3.0.0015 +- update kernel version to openEuler 4.19.90-2102.3.0 + * Mon Jan 18 2021 Yafen Fang - 4.19.90-2101.1.0.0014 - update kernel version to openEuler 4.19.90-2101.1.0 From 96c65774b0b3275e534fd42da3d97c77b043f44d Mon Sep 17 00:00:00 2001 From: yafen Date: Fri, 5 Mar 2021 14:58:38 +0800 Subject: [PATCH 2/3] fix: cp overlays/*.dtb --- raspberrypi-kernel.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index 8f44dbd..ea82813 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -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/ From d896200ccf6f8d0ac203305c20a9fc29d263db6d Mon Sep 17 00:00:00 2001 From: yafen Date: Tue, 9 Mar 2021 15:47:33 +0800 Subject: [PATCH 3/3] add Licenses in spec --- raspberrypi-kernel.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index ea82813..748d940 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -10,7 +10,7 @@ Name: raspberrypi-kernel Version: 4.19.90 Release: %{hulkrelease}.0015 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