Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gasket-driver for openSUSE:Factory
checked in at 2023-10-17 20:25:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gasket-driver (Old)
and /work/SRC/openSUSE:Factory/.gasket-driver.new.20540 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gasket-driver"
Tue Oct 17 20:25:05 2023 rev:3 rq:1118252 version:1.0.18_09385d4
Changes:
--------
--- /work/SRC/openSUSE:Factory/gasket-driver/gasket-driver.changes
2023-07-25 11:49:15.200802595 +0200
+++ /work/SRC/openSUSE:Factory/.gasket-driver.new.20540/gasket-driver.changes
2023-10-17 20:25:22.412070070 +0200
@@ -1,0 +2,6 @@
+Tue Oct 17 00:00:26 UTC 2023 - Chris Bradbury <ch...@binaryspanner.com>
+
+- Remove `fix-kernel-gte-6.4.patch` as it has been merged upstream.
+- Fix ueficert package builds.
+
+-------------------------------------------------------------------
Old:
----
fix-kernel-gte-6.4.patch
gasket-driver-1.0.18.obscpio
New:
----
gasket-driver-1.0.18_09385d4.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gasket-driver.spec ++++++
--- /var/tmp/diff_new_pack.ui6r7e/_old 2023-10-17 20:25:22.948088834 +0200
+++ /var/tmp/diff_new_pack.ui6r7e/_new 2023-10-17 20:25:22.948088834 +0200
@@ -33,8 +33,12 @@
#
# norootforbuild
+# Upstream doesn't really do proper releases, so track the main branch
+# HEAD's commit hash as well.
+%define git_version 09385d4
+
Name: gasket-driver
-Version: 1.0.18
+Version: 1.0.18_%{git_version}
Release: 0
Summary: The Coral Gasket Driver allows usage of the Coral EdgeTPU on
Linux systems
License: GPL-2.0-only
@@ -43,7 +47,7 @@
Source0: %{name}-%{version}.tar.xz
Source1: group.conf
Source2: preamble
-Source3: gasket-driver-rpmlintrc
+Source3: %{name}-rpmlintrc
BuildRequires: %kernel_module_package_buildreqs
BuildRequires: pesign-obs-integration
BuildRequires: sysuser-tools
@@ -51,25 +55,20 @@
%sysusers_requires
# The dma-buf symbols used by this driver were moved into their own `DMA_BUF`
-# module namespace in kernel 5.16. Consequently, the upstream source
conditionally
-# imports the `DMA_BUF` module namespace if the kernel version is >= 5.16.
-# This patch removes that condition, allowing this module to be built for
kernels
-# that have backported the `DMA_BUF` namespace changes.
+# module namespace in kernel 5.16. Upstream's current attempt at fixing this
+# doesn't work with GCC versions that don't support the `__has_include`
directive.
+#
+# Affects:
+# - Leap 15.5
+#
# See:
# https://github.com/google/gasket-driver/pull/10
-#
https://github.com/google/gasket-driver/commit/a87c105c14e826dafd4b25c36fa7c7c657a7ad03.patch
+# https://github.com/google/gasket-driver/pull/16
+# https://github.com/google/gasket-driver/issues/17
+#
# PATCH-FIX-OPENSUSE fix-for-backported-dma-buf-ns.patch
gh#google/gasket-driver!10
Patch0: fix-for-backported-dma-buf-ns.patch
-# The function signature for `class_create()` was changed in kernels >= 6.4.x
to only accept a
-# single argument (see kernel commit #dcfbb67).
-# This patch conditionally modifies how `class_create()` is called depending
on the kernel version.
-# See:
-# https://github.com/google/gasket-driver/pull/13
-#
https://github.com/google/gasket-driver/commit/83cbe8264fc63511e4e6250f2426749951a340c8.patch
-# PATCH-FIX-OPENSUSE fix-kernel-gte-6.4.patch gh#google/gasket-driver!13
-Patch1: fix-kernel-gte-6.4.patch
-
# This directive instructs the build service to temporarily save the project's
# certificate as %%_sourcedir/_projectcert.crt. See:
# https://github.com/openSUSE/pesign-obs-integration
@@ -78,10 +77,9 @@
#
# needssslcertforbuild
#
-# Having included the above directive, using the `-c` flag below will cause
-# the "ueficert" package to get built. `%%_sourcedir` must be prefixed as the
-# working dir is changed before the build service attempts to source the
certificate.
-%kernel_module_package -p preamble -c %_sourcedir/_projectcert.crt
+# Having included the above directive, the below line will
+# cause the "ueficert" package to get built.
+%kernel_module_package -p %_sourcedir/preamble
%description
The Coral Gasket Driver allows usage of the Coral EdgeTPU on Linux systems.
@@ -90,13 +88,6 @@
for lightweight communication with Google ASICs.
- Apex refers to the EdgeTPU v1.
-
-
-
-
-# This magic "KMP" subpackage is documented in
-# https://en.opensuse.org/Kernel_Module_Packages#Specfile_mechanisms
-
%package KMP
Summary: Gasket Driver kernel modules
Group: System/Kernel
@@ -114,9 +105,6 @@
%patch0 -p1
%endif
-# Apply patches without conditions.
-%patch1 -p1
-
%build
# Build the kernel modules.
for flavor in %flavors_to_build; do
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ui6r7e/_old 2023-10-17 20:25:22.984090095 +0200
+++ /var/tmp/diff_new_pack.ui6r7e/_new 2023-10-17 20:25:22.984090095 +0200
@@ -11,8 +11,8 @@
<param name="url">https://github.com/google/gasket-driver</param>
<param name="scm">git</param>
<param name="exclude">.git</param>
- <param name="revision">97aeba5</param>
- <param name="version">1.0.18</param>
+ <param name="revision">main</param>
+ <param name="versionformat">1.0.18_%h</param>
</service>
<!-- Compress source files into a tarball. -->
<service name="tar" mode="buildtime"/>
++++++ fix-for-backported-dma-buf-ns.patch ++++++
--- /var/tmp/diff_new_pack.ui6r7e/_old 2023-10-17 20:25:22.996090515 +0200
+++ /var/tmp/diff_new_pack.ui6r7e/_new 2023-10-17 20:25:23.000090654 +0200
@@ -1,21 +1,12 @@
-From a87c105c14e826dafd4b25c36fa7c7c657a7ad03 Mon Sep 17 00:00:00 2001
-From: hibby50 <hibb...@gmail.com>
-Date: Thu, 20 Apr 2023 14:16:06 -0400
-Subject: [PATCH] import DMA_BUF regardless of kernel version
-
----
- src/gasket_page_table.c | 2 --
- 1 file changed, 2 deletions(-)
-
diff --git a/src/gasket_page_table.c b/src/gasket_page_table.c
-index e81ab2b..0e768e0 100644
+index c9067cb..0e768e0 100644
--- a/src/gasket_page_table.c
+++ b/src/gasket_page_table.c
@@ -53,9 +53,7 @@
#include <linux/version.h>
#include <linux/vmalloc.h>
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,16,0)
+-#if __has_include(<linux/dma-buf.h>)
MODULE_IMPORT_NS(DMA_BUF);
-#endif
++++++ gasket-driver-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.ui6r7e/_old 2023-10-17 20:25:23.024091494 +0200
+++ /var/tmp/diff_new_pack.ui6r7e/_new 2023-10-17 20:25:23.028091635 +0200
@@ -13,6 +13,4 @@
# This error is introduced by the KMP sub-package build.
addFilter("gasket-driver-kmp-.* E: suse-zypp-packageand")
-# This warning is introduced by the "pesign-repackage" Secure Boot cert
package build.
-addFilter("gasket-driver-ueficert.* W: non-conffile-in-etc")
++++++ gasket-driver.obsinfo ++++++
--- /var/tmp/diff_new_pack.ui6r7e/_old 2023-10-17 20:25:23.048092335 +0200
+++ /var/tmp/diff_new_pack.ui6r7e/_new 2023-10-17 20:25:23.052092475 +0200
@@ -1,5 +1,5 @@
name: gasket-driver
-version: 1.0.18
-mtime: 1645731663
-commit: 97aeba584efd18983850c36dcf7384b0185284b3
+version: 1.0.18_09385d4
+mtime: 1693941990
+commit: 09385d485812088e04a98a6e1227bf92663e0b59
