diff --git a/5.10.0-4.9.0.tar.gz b/5.10.0-4.9.0.tar.gz new file mode 100644 index 0000000..719a046 Binary files /dev/null and b/5.10.0-4.9.0.tar.gz differ diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index 42519f4..461e578 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -2,17 +2,17 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 4.0.0 +%global hulkrelease 4.9.0 %global debug_package %{nil} Name: raspberrypi-kernel Version: 5.10.0 -Release: %{hulkrelease}.1 +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 @@ -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} @@ -58,7 +58,7 @@ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.raspi.%{_target_cpu} 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,5 +172,16 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/ /lib/modules/%{KernelVer} %changelog +* Tue Mar 9 2021 Yafen Fang - 5.10.0-4.9.0.4 +- update kernel version to openEuler 5.10.0-4.9.0 + +* Thu Mar 4 2021 Yafen Fang - 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) + +* Fri Feb 26 2021 Yafen Fang - 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) + * Mon Feb 22 2021 Yafen Fang - 5.10.0-4.0.0.1 -- update kernel version to openEuler 5.10.0-4.0.0 \ No newline at end of file +- update kernel version to openEuler 5.10.0-4.0.0