commit 35b1d4f9271f350c1867129183383746d30c4923 Author: Kate Hsuan <hpa(a)redhat.com&gt; Date: Fri Apr 19 14:24:35 2024 +0800 Update ivsc to commit a6dccbb - Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7 - Resolved ivsc: "Update mei_dev.h for kernel >= 6.8" .gitignore | 1 + intel-ipu6-kmod.spec | 15 +++---- sources | 2 +- vsc-44.patch | 124 --------------------------------------------------- 4 files changed, 9 insertions(+), 133 deletions(-) --- diff --git a/.gitignore b/.gitignore index 38e131b..a5e3def 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ivsc-driver-e8ea8b8.tar.gz /ipu6-drivers-fb4c170.tar.gz /ivsc-driver-73a044d.tar.gz +/ivsc-driver-a6dccbb.tar.gz diff --git a/intel-ipu6-kmod.spec b/intel-ipu6-kmod.spec index ece4bee..cf960e1 100644 --- a/intel-ipu6-kmod.spec +++ b/intel-ipu6-kmod.spec @@ -7,8 +7,8 @@ %global ipu6_commitdate 20240226 %global ipu6_shortcommit %(c=%{ipu6_commit}; echo ${c:0:7}) -%global ivsc_commit 73a044d9633212fac54ea96cdd882ff5ab40573e -%global ivsc_commitdate 20231109 +%global ivsc_commit a6dccbbf5a955489d20d996234b6ebb481183ed7 +%global ivsc_commitdate 20240416 %global ivsc_shortcommit %(c=%{ivsc_commit}; echo ${c:0:7}) %global prjname intel-ipu6 @@ -16,7 +16,7 @@ Name: %{prjname}-kmod Summary: Kernel module (kmod) for %{prjname} Version: 0.0 -Release: 12.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist} +Release: 13.%{ipu6_commitdate}git%{ipu6_shortcommit}%{?dist} License: GPLv2+ URL: https://github.com/intel @@ -34,8 +34,6 @@ Patch13: 4.patch Patch14: 5.patch Patch15: 6.patch Patch16: 0001-Skip-ljca-modules-for-the-kernel-6.7.patch -# https://github.com/intel/ivsc-driver/pull/44 -Patch17: vsc-44.patch BuildRequires: gcc BuildRequires: elfutils-libelf-devel @@ -71,9 +69,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{prjname} %{?buil %patch 16 -p1 ) -(cd ivsc-driver-%{ivsc_commit} -%patch 17 -p1 -) cp -Rp ivsc-driver-%{ivsc_commit}/backport-include ipu6-drivers-%{ipu6_commit}/ cp -Rp ivsc-driver-%{ivsc_commit}/drivers ipu6-drivers-%{ipu6_commit}/ @@ -109,6 +104,10 @@ done %changelog +* Fri Apr 19 2024 Kate Hsuan <hpa(a)redhat.cpm&gt; - 0.0-13.20240226gitfb4c170 +- Update ivsc to commit a6dccbbf5a955489d20d996234b6ebb481183ed7 +- ivsc: Update mei_dev.h for kernel >= 6.8 + * Thu Mar 07 2024 Kate Hsuan <hpa(a)redhat.com&gt; - 0.0-12.20240226gitfb4c170 - Fix for kernel >= 6.7 - Fix and improve ipu6_isys probe() diff --git a/sources b/sources index 333b367..ccd6367 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ipu6-drivers-fb4c170.tar.gz) = 1722fb07428844303f5b8f6694691f19db90651119db5cd90e665019101c3b6c46e82232a9bf87abaf2c982ce01bf7a672d584b03eab5c9810bf74840e02f055 -SHA512 (ivsc-driver-73a044d.tar.gz) = b43b51fb7a08fc619333796eb76098173da1919ba0f008d46900269b01e076baa203c714abbb677825d1070905f1cca0a124a02dedc023e9ac2ecf72b62cdf71 +SHA512 (ivsc-driver-a6dccbb.tar.gz) = 10e0c4c24d9f7e3ffb99aa36808663fec3b6a020b22c1625da2548c5939ee0ae532a0f7e48ed5701b67233bb430e0dce65ea64870b253d83ba586ff427d35551