From 00b5519cd75a6efc311f731736ff1ef08ab37af072174ad1c0062cb29ae9dfed Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 8 Jul 2024 12:08:50 +0000 Subject: [PATCH 1/2] Accepting request 1186153 from home:eeich:branches:X11:Drivers:Video:Redesign - Use macro which is set during build but not when running `osc service run download_files` to make sure both source versions are visible for download. This way, only the correct source tarball will be included in the source package of its respective flavor but both can be downloaded (updated) simultaniously. in specfile OBS-URL: https://build.opensuse.org/request/show/1186153 OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=114 --- nvidia-open-driver-G06-signed.changes | 11 ++++++++++- nvidia-open-driver-G06-signed.spec | 8 +++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/nvidia-open-driver-G06-signed.changes b/nvidia-open-driver-G06-signed.changes index f0d1560..76762e0 100644 --- a/nvidia-open-driver-G06-signed.changes +++ b/nvidia-open-driver-G06-signed.changes @@ -1,8 +1,17 @@ +------------------------------------------------------------------- +Mon Jul 8 11:29:07 UTC 2024 - Egbert Eich + +- Use macro which is set during build but not when running + `osc service run download_files` to make sure both source versions + are visible for download. This way, only the correct source + tarball will be included in the source package of its respective + flavor but both can be downloaded (updated) simultaniously. + ------------------------------------------------------------------- Fri Jul 5 08:41:55 UTC 2024 - Stefan Dirsch - make buildservice happy; all sources need to be mentioned as such - in specfile + in specfile ------------------------------------------------------------------- Thu Jul 4 16:29:09 UTC 2024 - Egbert Eich diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 9a6c50e..7f2d9ea 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -26,7 +26,9 @@ ExclusiveArch: do_not_build %endif %{bcond_without cuda} %endif - +# This is defined at build, not for 'osc service run download_files` or +# factory_auto. This both sources are seen outside of the build but only +# the matching one will be included in the srpm for the respective flavor. %if %{undefined kernel_module_directory} %if 0%{?suse_version} >= 1550 %define kernel_module_directory /usr/lib/modules @@ -53,8 +55,8 @@ License: GPL-2.0-only AND MIT Group: System/Kernel URL: https://github.com/NVIDIA/open-gpu-kernel-modules/ Source0: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{version}.tar.gz#/open-gpu-kernel-modules-%{version}.tar.gz -%if %{with please_fix_factory_auto} -Source16: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%cuda_version}.tar.gz#/open-gpu-kernel-modules-%{cuda_version}.tar.gz +%if %{undefined linux_arch} +Source16: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{cuda_version}.tar.gz#/open-gpu-kernel-modules-%{cuda_version}.tar.gz Source17: pci_ids-supported-%{cuda_version} Source18: pci_ids-%{cuda_version} %endif From 3f3e682dfadbbaafe674e79249ec5976e60a36765ec2c5b560ac946e0745a288 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Mon, 8 Jul 2024 14:46:02 +0000 Subject: [PATCH 2/2] Accepting request 1186191 from home:eeich:branches:X11:Drivers:Video:Redesign - Move comment to the right location. OBS-URL: https://build.opensuse.org/request/show/1186191 OBS-URL: https://build.opensuse.org/package/show/X11:Drivers:Video:Redesign/nvidia-open-driver-G06-signed?expand=0&rev=115 --- nvidia-open-driver-G06-signed.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nvidia-open-driver-G06-signed.spec b/nvidia-open-driver-G06-signed.spec index 7f2d9ea..b337e02 100644 --- a/nvidia-open-driver-G06-signed.spec +++ b/nvidia-open-driver-G06-signed.spec @@ -26,9 +26,6 @@ ExclusiveArch: do_not_build %endif %{bcond_without cuda} %endif -# This is defined at build, not for 'osc service run download_files` or -# factory_auto. This both sources are seen outside of the build but only -# the matching one will be included in the srpm for the respective flavor. %if %{undefined kernel_module_directory} %if 0%{?suse_version} >= 1550 %define kernel_module_directory /usr/lib/modules @@ -55,6 +52,9 @@ License: GPL-2.0-only AND MIT Group: System/Kernel URL: https://github.com/NVIDIA/open-gpu-kernel-modules/ Source0: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{version}.tar.gz#/open-gpu-kernel-modules-%{version}.tar.gz +# This is defined at build, not for 'osc service run download_files` or +# factory_auto. This both sources are seen outside of the build but only +# the matching one will be included in the srpm for the respective flavor. %if %{undefined linux_arch} Source16: https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/%{cuda_version}.tar.gz#/open-gpu-kernel-modules-%{cuda_version}.tar.gz Source17: pci_ids-supported-%{cuda_version}