From 9602260a0fcd2d0828e9189998e467abdde9ce738bd9e37191af6f211b1f274e Mon Sep 17 00:00:00 2001 From: Chris Bradbury Date: Tue, 17 Oct 2023 03:03:02 +0000 Subject: [PATCH] Accepting request 1118132 from home:chrBrd:branches:hardware Tidies and improvements to specfile. OBS-URL: https://build.opensuse.org/request/show/1118132 OBS-URL: https://build.opensuse.org/package/show/hardware/gasket-driver?expand=0&rev=16 --- _service | 2 +- ...tch => fix-for-backported-dma-buf-ns.patch | 0 gasket-driver-1.0.18.obscpio | 3 -- gasket-driver-1.0.18_09385d4.obscpio | 3 ++ gasket-driver-rpmlintrc | 2 - gasket-driver.obsinfo | 2 +- gasket-driver.spec | 37 ++++++++----------- 7 files changed, 21 insertions(+), 28 deletions(-) rename leap-15-5-fix-for-backported-dma-buf-ns.patch => fix-for-backported-dma-buf-ns.patch (100%) delete mode 100644 gasket-driver-1.0.18.obscpio create mode 100644 gasket-driver-1.0.18_09385d4.obscpio diff --git a/_service b/_service index 31c6214..398f93e 100644 --- a/_service +++ b/_service @@ -12,7 +12,7 @@ https://en.opensuse.org/openSUSE:Build_Service_Concept_SourceService git .git main - 1.0.18 + 1.0.18_%h diff --git a/leap-15-5-fix-for-backported-dma-buf-ns.patch b/fix-for-backported-dma-buf-ns.patch similarity index 100% rename from leap-15-5-fix-for-backported-dma-buf-ns.patch rename to fix-for-backported-dma-buf-ns.patch diff --git a/gasket-driver-1.0.18.obscpio b/gasket-driver-1.0.18.obscpio deleted file mode 100644 index b9e332e..0000000 --- a/gasket-driver-1.0.18.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0dfde4e03666e728432b508a524e92495d3bf2bc131241042d89b370479b73b7 -size 257547 diff --git a/gasket-driver-1.0.18_09385d4.obscpio b/gasket-driver-1.0.18_09385d4.obscpio new file mode 100644 index 0000000..ebbbe72 --- /dev/null +++ b/gasket-driver-1.0.18_09385d4.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b23694f2d97ed358dc8875a251f0148a5f5573e785a60a38495cab3fc6b504d3 +size 257547 diff --git a/gasket-driver-rpmlintrc b/gasket-driver-rpmlintrc index dce77bd..4377b64 100644 --- a/gasket-driver-rpmlintrc +++ b/gasket-driver-rpmlintrc @@ -13,5 +13,3 @@ addFilter("E: no-binary") # 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") diff --git a/gasket-driver.obsinfo b/gasket-driver.obsinfo index 91c3155..d02e8f1 100644 --- a/gasket-driver.obsinfo +++ b/gasket-driver.obsinfo @@ -1,4 +1,4 @@ name: gasket-driver -version: 1.0.18 +version: 1.0.18_09385d4 mtime: 1693941990 commit: 09385d485812088e04a98a6e1227bf92663e0b59 diff --git a/gasket-driver.spec b/gasket-driver.spec index 436c7b0..11a10ab 100644 --- a/gasket-driver.spec +++ b/gasket-driver.spec @@ -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 @@ URL: https://github.com/google/gasket-driver 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 @@ -52,15 +56,18 @@ Requires: %{name}-kmp # The dma-buf symbols used by this driver were moved into their own `DMA_BUF` # 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, -# which is the case for Leap 15.5. - +# 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/pull/16 # https://github.com/google/gasket-driver/issues/17 # -# PATCH-FIX-OPENSUSE leap-15-5-fix-for-backported-dma-buf-ns.patch gh#google/gasket-driver!10 -Patch0: leap-15-5-fix-for-backported-dma-buf-ns.patch +# PATCH-FIX-OPENSUSE fix-for-backported-dma-buf-ns.patch gh#google/gasket-driver!10 +Patch0: fix-for-backported-dma-buf-ns.patch # This directive instructs the build service to temporarily save the project's # certificate as %%_sourcedir/_projectcert.crt. See: @@ -70,8 +77,8 @@ Patch0: leap-15-5-fix-for-backported-dma-buf-ns.patch # # needssslcertforbuild # -# Having included the above directive, the below will cause the "ueficert" package -#to get built. +# Having included the above directive, the below line will +# cause the "ueficert" package to get built. %kernel_module_package -p %_sourcedir/preamble %description @@ -81,18 +88,6 @@ The driver contains two modules: 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