From 81926fe5bee3e4674988efcd6a4b40d5a6c5f3fa Mon Sep 17 00:00:00 2001 From: yafen Date: Tue, 17 Aug 2021 02:04:17 +0800 Subject: [PATCH] update kernel to openEuler 5.10.0-5.3.0 --- 0001-fix-error-for-openEuler.patch | 28 ---------------------------- raspberrypi-kernel.spec | 9 +++++---- 2 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 0001-fix-error-for-openEuler.patch diff --git a/0001-fix-error-for-openEuler.patch b/0001-fix-error-for-openEuler.patch deleted file mode 100644 index 5835be8..0000000 --- a/0001-fix-error-for-openEuler.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f53ef1f41fcc961f0590e9b31a85e255f6ff80ef Mon Sep 17 00:00:00 2001 -From: Fang Yafen -Date: Sun, 8 Aug 2021 21:35:07 +0800 -Subject: [PATCH 2/2] patch for openEuler - ---- - include/linux/iommu.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/include/linux/iommu.h b/include/linux/iommu.h -index f0e2c1f5d143..7b433c36111b 100644 ---- a/include/linux/iommu.h -+++ b/include/linux/iommu.h -@@ -1206,11 +1206,6 @@ iommu_sva_bind_group(struct iommu_group *group, struct mm_struct *mm, - return NULL; - } - --int iommu_bind_guest_msi(struct iommu_domain *domain, -- dma_addr_t giova, phys_addr_t gpa, size_t size) --{ -- return -ENODEV; --} - static inline - void iommu_unbind_guest_msi(struct iommu_domain *domain, dma_addr_t giova) {} - --- -2.27.0 - diff --git a/raspberrypi-kernel.spec b/raspberrypi-kernel.spec index 443a478..5c0f81f 100644 --- a/raspberrypi-kernel.spec +++ b/raspberrypi-kernel.spec @@ -2,19 +2,18 @@ %global KernelVer %{version}-%{release}.raspi.%{_target_cpu} -%global hulkrelease 5.1.0 +%global hulkrelease 5.3.0 %global debug_package %{nil} Name: raspberrypi-kernel Version: 5.10.0 -Release: %{hulkrelease}.1 +Release: %{hulkrelease}.2 Summary: Linux Kernel License: GPLv2 URL: http://www.kernel.org/ Source0: kernel.tar.gz Patch0000: 0000-raspberrypi-kernel.patch -Patch0001: 0001-fix-error-for-openEuler.patch BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, tar BuildRequires: bzip2, xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk @@ -50,7 +49,6 @@ cp -a linux-%{version} linux-%{KernelVer} cd linux-%{KernelVer} %patch0000 -p1 -%patch0001 -p1 find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null find . -name .gitignore -exec rm -f {} \; >/dev/null @@ -176,5 +174,8 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/ /lib/modules/%{KernelVer} %changelog +* Mon Aug 16 2021 Yafen Fang - 5.10.0-5.3.0.2 +- package init based on openEuler 5.10.0-5.3.0 + * Mon Aug 9 2021 Yafen Fang - 5.10.0-5.1.0.1 - package init based on openEuler 5.10.0-5.1.0 \ No newline at end of file