1
0

Accepting request 1060962 from X11:Drivers:Video:Redesign

- added pesign-copy-sources, pesign-spec-macros, which are needed
  to fix repackaging step required for securebooot signing kernel
  modules (boo#1207520)
- pesign-spec-macros: used for defining RPM macros; here:
  %define __kmp_supplements %_sourcedir/my-find-supplements \
                            %_sourcedir/pci_ids-%{version}
- pesign-copy-sources: sources needed by the RPM macros above; 
  here: pci_ids-%{version}, my-find-supplements
- all above needs changes for pesign-obs-integration first 
  (SR#1060443)

- added conflicts to nvidia-driver-G06-kmp package (boo#1207495)

OBS-URL: https://build.opensuse.org/request/show/1060962
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nvidia-open-driver-G06-signed?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2023-01-25 16:43:00 +00:00 committed by Git OBS Bridge
commit b9a5374bd1
5 changed files with 33 additions and 7 deletions

View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Wed Jan 25 15:00:04 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- added pesign-copy-sources, pesign-spec-macros, which are needed
to fix repackaging step required for securebooot signing kernel
modules (boo#1207520)
- pesign-spec-macros: used for defining RPM macros; here:
%define __kmp_supplements %_sourcedir/my-find-supplements \
%_sourcedir/pci_ids-%{version}
- pesign-copy-sources: sources needed by the RPM macros above;
here: pci_ids-%{version}, my-find-supplements
- all above needs changes for pesign-obs-integration first
(SR#1060443)
-------------------------------------------------------------------
Tue Jan 24 23:52:53 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
- added conflicts to nvidia-driver-G06-kmp package (boo#1207495)
-------------------------------------------------------------------
Thu Jan 19 19:51:20 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package nvidia-Open-gfxG06
# spec file for package nvidia-open-driver-G06-signed
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,6 +15,7 @@
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%if %{undefined kernel_module_directory}
%if 0%{?usrmerged}
%define kernel_module_directory /usr/lib/modules
@ -32,7 +33,7 @@ Name: nvidia-open-driver-G06-signed
Version: 525.85.05
Release: 0
Summary: NVIDIA open kernel module driver for GeForce RTX 2000 series and newer
License: GPL-2.0 and MIT
License: GPL-2.0-only AND MIT
Group: System/Kernel
URL: https://github.com/NVIDIA/open-gpu-kernel-modules/
Source0: open-gpu-kernel-modules-%{version}.tar.gz
@ -46,6 +47,8 @@ Source7: preamble
Source8: json-to-pci-id-list.py
Source9: pci_ids-unsupported-%{version}
Source10: pci_ids-unsupported
Source11: pesign-copy-sources
Source12: pesign-spec-macros
Patch0: 0001-Don-t-override-INSTALL_MOD_DIR.patch
Patch2: persistent-nvidia-id-string.patch
BuildRequires: %{kernel_module_package_buildreqs}
@ -56,7 +59,7 @@ BuildRequires: perl-Bootloader
BuildRequires: pesign-obs-integration
BuildRequires: zstd
%ifnarch aarch64
%if 0%{?sle_version} >= 120400 && !0%{?is_opensuse}
%if 0%{?sle_version} >= 120400 && !0%{?is_opensuse}
BuildRequires: kernel-syms-azure
%endif
%endif
@ -68,8 +71,8 @@ ExclusiveArch: x86_64 aarch64
%(sed -e '/^%%post\>/ r %_sourcedir/kmp-post.sh' -e '/^%%postun\>/ r %_sourcedir/kmp-postun.sh' %kmp_template_name >%_builddir/nvidia-kmp-template)
%kernel_module_package -n %{name} -t %_builddir/nvidia-kmp-template -f %_sourcedir/kmp-filelist -p %_sourcedir/preamble
# create hardware supplements
%define __kmp_supplements %_sourcedir/my-find-supplements %_sourcedir/pci_ids-%{version}
# create hardware supplements for manual builds
%{load:%{SOURCE12}}
# newer rpmbuilds attach the kernel version and the major part of release to %%pci_id_file of the __kmp_supplements script
# boo#1190210

3
pesign-copy-sources Normal file
View File

@ -0,0 +1,3 @@
pci_ids-%{version}
my-find-supplements

1
pesign-spec-macros Normal file
View File

@ -0,0 +1 @@
%__kmp_supplements %{_sourcedir}/my-find-supplements %{_sourcedir}/pci_ids-%{version}

View File

@ -1,4 +1,4 @@
Requires: kernel-firmware-nvidia-gsp-G06 = %{-v*}
Requires: perl-Bootloader
Conflicts: nvidia-gfxG06-kmp nvidia-open-driver-G06-kmp
Conflicts: nvidia-gfxG06-kmp nvidia-driver-G06-kmp nvidia-open-driver-G06-kmp
Requires: group(video)