[ipu6-camera-bins] Update to commit 987b09ad7e6124ab8623a986f92ecb47061b8fa0
by jwrdegoede
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
4 months, 3 weeks
[xv] readd xv.png source
by Leigh Scott
commit c22779ffde798d8ebb250b167322f6b05b56afba
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jun 27 13:01:53 2024 +0100
readd xv.png source
sources | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/sources b/sources
index 12e3dec..a20910f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (v5.2.0.tar.gz) = 0af7ff6db152be849c27be9fba116513595deeca9e3eb42ec6fd74a4756d0c525b55a40de49aa37dd5d2ea4a29e6d644c8c4c709f0e1ec0a98cbc0ae7221b110
+SHA512 (xv.png) = ed4d00d5dfadab690a8befe78d3a280f745963399360f31fd8dfe1a8b87af0e9eb3b93028f91745b11ecc6cd9e84b2f5df48b429fc768eab31f2bd127d466f14
4 months, 3 weeks
[nvidia-settings/f40: 4/4] Merge branch 'master' into f40
by Leigh Scott
commit cd94d5beaa392d9e2660529b7ed29ee53a453869
Merge: 7bd9c6a cee4c9a
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jun 27 22:35:42 2024 +0100
Merge branch 'master' into f40
nvidia-settings.spec | 12 +++++++++---
sources | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
---
4 months, 3 weeks
[nvidia-persistenced/f39: 5/5] Merge branch 'f40' into f39
by Leigh Scott
commit 249e8eb9b67f95bd6f6233a4c0db764771dbceb9
Merge: fa721e5 887726d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jun 27 22:31:19 2024 +0100
Merge branch 'f40' into f39
nvidia-persistenced.spec | 12 +++++++++---
sources | 2 +-
2 files changed, 10 insertions(+), 4 deletions(-)
---
4 months, 3 weeks
[nvidia-kmod/f39] (5 commits) ...Merge branch 'f40' into f39
by Leigh Scott
Summary of changes:
27c29be... Update to 555.42.02 beta (*)
b18f29a... Update to 555.52.04 beta (*)
1f1630d... Update to 555.58 release (*)
782739f... Merge branch 'master' into f40 (*)
826b83c... Merge branch 'f40' into f39
(*) This commit already existed in another branch; no separate mail sent
4 months, 3 weeks
[ipu6-camera-hal] Add missing libdrm-devel BuildRequires
by jwrdegoede
commit 47034ab9d3d1e928c1b6b250179d9d5878794ed2
Author: Hans de Goede <hdegoede(a)redhat.com>
Date: Thu Jun 27 23:37:31 2024 +0200
Add missing libdrm-devel BuildRequires
ipu6-camera-hal.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/ipu6-camera-hal.spec b/ipu6-camera-hal.spec
index 2063e9c..7593416 100644
--- a/ipu6-camera-hal.spec
+++ b/ipu6-camera-hal.spec
@@ -31,6 +31,7 @@ BuildRequires: cmake
BuildRequires: gcc
BuildRequires: g++
BuildRequires: expat-devel
+BuildRequires: libdrm-devel
ExclusiveArch: x86_64
4 months, 3 weeks
[VirtualBox-kmod/el9] Build for centos 9.5 and rhel 9.4
by Sérgio M. Basto
commit 8b3ae9a01670aa136f63c45da4b828704145282a
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Jun 26 21:54:50 2024 +0100
Build for centos 9.5 and rhel 9.4
VirtualBox-kmod.spec | 2 +-
centos9.4.patch => centos9.5.patch | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 2383afb..cfeeeea 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -49,7 +49,7 @@ URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
Patch1: fix_7.0.6_locking_problems.patch
-Patch2: centos9.4.patch
+Patch2: centos9.5.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool VirtualBox-kmodsrc = %{version} xz time elfutils-libelf-devel gcc
diff --git a/centos9.4.patch b/centos9.5.patch
similarity index 92%
rename from centos9.4.patch
rename to centos9.5.patch
index af2ca64..dc21fa0 100644
--- a/centos9.4.patch
+++ b/centos9.5.patch
@@ -6,7 +6,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c V
flush_dcache_page(pMemLnx->apPages[rc]);
# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
-# if RTLNX_VER_MIN(6,3,0)
-+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4)
++# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5)
vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
# else
papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
@@ -15,7 +15,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c V
LNX_MM_UP_READ(pTask->mm);
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
-+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,3)
++# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,4)
RTMemFree(papVMAs);
# endif
@@ -24,7 +24,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxdrv/r0drv/linux/memobj-r0drv-linux.c V
* See remap_pfn_range() in mm/memory.c */
-#if RTLNX_VER_MIN(6,3,0)
-+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4)
++#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5)
vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
#elif RTLNX_VER_MIN(3,7,0)
vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
@@ -36,7 +36,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c
flush_dcache_page(pMemLnx->apPages[rc]);
# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
-# if RTLNX_VER_MIN(6,3,0)
-+# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4)
++# if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5)
vm_flags_set(papVMAs[rc], VM_DONTCOPY | VM_LOCKED);
# else
papVMAs[rc]->vm_flags |= VM_DONTCOPY | VM_LOCKED;
@@ -45,7 +45,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c
LNX_MM_UP_READ(pTask->mm);
-# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0)
-+# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,3)
++# if GET_USER_PAGES_API < KERNEL_VERSION(6, 5, 0) && RTLNX_RHEL_MAX(9,4)
RTMemFree(papVMAs);
# endif
@@ -54,7 +54,7 @@ diff -rup VirtualBox-kmod-7.0.18.orig/vboxguest/r0drv/linux/memobj-r0drv-linux.c
* See remap_pfn_range() in mm/memory.c */
-#if RTLNX_VER_MIN(6,3,0)
-+#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,4)
++#if RTLNX_VER_MIN(6,3,0) || RTLNX_RHEL_MIN(9,5)
vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP);
#elif RTLNX_VER_MIN(3,7,0)
vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
4 months, 3 weeks
[buildsys-build-rpmfusion/el9] rebuild for kernel 5.14.0-427.22.1.el9_4
by Nicolas Chauvet
commit 9a442b91bfe17507b95b69d9e0065c6ab4994892
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Jun 26 18:22:23 2024 +0200
rebuild for kernel 5.14.0-427.22.1.el9_4
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index e31c550..c2382d2 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-5.14.0-362.8.1.el9_3
-5.14.0-362.8.1.el9_3smp
-5.14.0-362.8.1.el9_3PAE
-5.14.0-362.8.1.el9_3lpae
+5.14.0-427.22.1.el9_4
+5.14.0-427.22.1.el9_4smp
+5.14.0-427.22.1.el9_4PAE
+5.14.0-427.22.1.el9_4lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 8abd0a5..527ff37 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
Version: 35
-Release: 0.8%{?dist}
+Release: 0.9%{?dist}
Summary: Tools and files used by the %{repo} buildsys
License: MIT
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Wed Jun 26 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.9
+- rebuild for kernel 5.14.0-427.22.1.el9_4
+
* Fri Nov 24 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 11:35-0.8
- rebuild for kernel 5.14.0-362.8.1.el9_3
4 months, 3 weeks
[nvidia-modprobe/f40: 4/4] Merge branch 'master' into f40
by Leigh Scott
commit 7863aa84830bddc7115e47c9692a00ae71344588
Merge: 55be6d0 0a60221
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Jun 27 22:21:58 2024 +0100
Merge branch 'master' into f40
nvidia-modprobe.spec | 14 ++++++++++++--
sources | 2 +-
2 files changed, 13 insertions(+), 3 deletions(-)
---
diff --cc nvidia-modprobe.spec
index 6e0d3cd,2f297f9..d4616c4
--- a/nvidia-modprobe.spec
+++ b/nvidia-modprobe.spec
@@@ -1,6 -1,6 +1,10 @@@
Name: nvidia-modprobe
Epoch: 3
++<<<<<<< HEAD
+Version: 550.90.07
++=======
+ Version: 555.58
++>>>>>>> master
Release: 1%{?dist}
Summary: Load the NVIDIA kernel module and create NVIDIA character device files
4 months, 3 weeks
