2 p.m.
commit 96c503015080aa59639393efe26eb8d7e0ac945d
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jun 27 18:29:02 2024 +0200
Update to commit 987b09ad7e6124ab8623a986f92ecb47061b8fa0
Drop ipu6-camera-bins-firmware and switch to requiring the new
Fedora linux-firmware intel-vsc-firmware subpackage
.gitignore | 1 +
ipu6-camera-bins.rpmlintrc | 14 ++++++++++++++
ipu6-camera-bins.spec | 48 ++++++++++++++++++++--------------------------
sources | 2 +-
4 files changed, 37 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a47e7df..5706bef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/ipu6-camera-bins-4694ba7.tar.gz
/ipu6-camera-bins-276859f.tar.gz
/ipu6-camera-bins-af5ba0c.tar.gz
+/ipu6-camera-bins-987b09a.tar.gz
diff --git a/ipu6-camera-bins.rpmlintrc b/ipu6-camera-bins.rpmlintrc
new file mode 100644
index 0000000..063e41b
--- /dev/null
+++ b/ipu6-camera-bins.rpmlintrc
@@ -0,0 +1,14 @@
+# Most of the per ipu6 version header files are identical
+addFilter("W: files-duplicate")
+addFilter("E: files-duplicated-waste")
+# These are the actual .so files not symlinks
+addFilter("W: devel-file-in-non-devel-package")
+# This has been replaced, so it should not be provided
+addFilter("W: obsolete-not-provided")
+# All of these are because these are Intel proprietary binaries,
+# not build from source FOSS code
+addFilter("W: unstripped-binary-or-object")
+addFilter("E: static-library-without-debuginfo")
+addFilter("W: spurious-executable-perm")
+addFilter("W: no-documentation")
+addFilter("W: invalid-license")
diff --git a/ipu6-camera-bins.spec b/ipu6-camera-bins.spec
index aa58ca1..7571687 100644
--- a/ipu6-camera-bins.spec
+++ b/ipu6-camera-bins.spec
@@ -1,14 +1,15 @@
%global debug_package %{nil}
-%global commit af5ba0cb4a763569ac7514635013e9d870040bcf
-%global commitdate 20231027
+%global commit 987b09ad7e6124ab8623a986f92ecb47061b8fa0
+%global commitdate 20240507
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: ipu6-camera-bins
Summary: Binary library for Intel IPU6
Version: 0.0
-Release: 10.%{commitdate}git%{shortcommit}%{?dist}
+Release: 11.%{commitdate}git%{shortcommit}%{?dist}
License: Proprietary
+URL: https://github.com/intel/ipu6-camera-bins
Source0:
https://github.com/intel/%{name}/archive/%{commit}/%{name}-%{shortcommit}...
@@ -18,11 +19,18 @@ BuildRequires: patchelf
ExclusiveArch: x86_64
-Requires: ipu6-camera-bins-firmware
-Requires: ivsc-firmware
Requires: gstreamer1-plugins-icamerasrc
Requires: v4l2-relayd
-Requires: intel-ipu6-kmod
+Requires: intel-ipu6-kmod >= 0.0-14
+
+# Require the new Fedora linux-firmware intel-vsc-firmware subpackage and
+# obsolete but do not provide old firmware packages
+Requires: intel-vsc-firmware >= 20240513
+Obsoletes: ipu6-camera-bins-firmware < 0.0-11
+# TODO stop requiring and instead obsolete ivsc-firmware once users are no
+# longer using kernels < 6.10 (and also retire the ivsc-firmware pkg)
+Requires: ivsc-firmware
+# Obsoletes: ivsc-firmware < 0.0-8
# For kmod package
Provides: intel-ipu6-kmod-common = %{version}
@@ -32,14 +40,9 @@ This provides the necessary binaries for Intel IPU6, including library
and
firmware. The library includes necessary image processing algorithms and
3A algorithm for the camera.
-%package firmware
-Summary: IPU6 firmware
-
-%description firmware
-This provides the necessary firmware for Intel IPU6.
%package devel
-Summary: IPU6 header files for development.
+Summary: IPU6 header files for development
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -67,11 +70,6 @@ for i in ipu_tgl ipu_adl ipu_mtl; do
%{buildroot}%{_libdir}/$i/pkgconfig/*.pc
done
-# IPU6 firmwares
-install -p -D -m 0644 lib/firmware/intel/ipu6_fw.bin
%{buildroot}/usr/lib/firmware/intel/ipu6_fw.bin
-install -p -D -m 0644 lib/firmware/intel/ipu6ep_fw.bin
%{buildroot}/usr/lib/firmware/intel/ipu6ep_fw.bin
-install -p -D -m 0644 lib/firmware/intel/ipu6epadln_fw.bin
%{buildroot}/usr/lib/firmware/intel/ipu6epadln_fw.bin
-install -p -D -m 0644 lib/firmware/intel/ipu6epmtl_fw.bin
%{buildroot}/usr/lib/firmware/intel/ipu6epmtl_fw.bin
%files
%license LICENSE
@@ -82,15 +80,6 @@ install -p -D -m 0644 lib/firmware/intel/ipu6epmtl_fw.bin
%{buildroot}/usr/lib/f
%{_libdir}/ipu_adl/*.so*
%{_libdir}/ipu_mtl/*.so*
-%files firmware
-%license LICENSE
-%dir /usr/lib/firmware
-%dir /usr/lib/firmware/intel
-/usr/lib/firmware/intel/ipu6_fw.bin
-/usr/lib/firmware/intel/ipu6ep_fw.bin
-/usr/lib/firmware/intel/ipu6epadln_fw.bin
-/usr/lib/firmware/intel/ipu6epmtl_fw.bin
-
%files devel
%dir %{_includedir}/ipu_tgl
%dir %{_includedir}/ipu_adl
@@ -110,7 +99,12 @@ install -p -D -m 0644 lib/firmware/intel/ipu6epmtl_fw.bin
%{buildroot}/usr/lib/f
%changelog
-* Fri Mar 08 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-10.220231027gitaf5ba0c
+* Mon Jun 24 2024 Hans de Goede <hdegoede(a)redhat.com> - 0.0-11.20240507git987b09a
+- Update to commit 987b09ad7e6124ab8623a986f92ecb47061b8fa0
+- Drop ipu6-camera-bins-firmware and switch to requiring the new
+ Fedora linux-firmware intel-vsc-firmware subpackage
+
+* Fri Mar 08 2024 Kate Hsuan <hpa(a)redhat.com> - 0.0-10.20231027gitaf5ba0c
- Update to the latest upstream commit
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
0.0-9.20230208git276859f
diff --git a/sources b/sources
index 40c229f..b996dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipu6-camera-bins-af5ba0c.tar.gz) =
3bc29a31388e599840e2b8af799a085ea19d33a613cd4487d75e34ca9050c56d1becdf24e368aa671ed32e063ecb751f6f7e75e72326fa059588a181d3c1823b
+SHA512 (ipu6-camera-bins-987b09a.tar.gz) =
e728a42cf9ab33f2039d8316e94fa9715abe9b49e5b6ceff952564452e6c7b40fe82905aa859e2cb3e579732f01fdf27b5bed17bb636dd0f01fb7790fda522a4