pool/openSUSE-repos
SHA256
11
0
Fork 0
Code Issues Pull Requests Activity

Accepting request 1103358 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1103358
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openSUSE-repos?expand=0&rev=10
This commit is contained in:
Dominique Leuenberger
2023-08-11 13:55:46 +00:00
committed by Git OBS Bridge
parent e93d540081 c4a876d6d5
commit 1008974a9a
6 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_servicedata
View File

@@ -1,4 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/openSUSE-repos.git</param>
<param name="changesrevision">41e41a99bdc5b3b5b5f4dc3588508f6e1fda6526</param></service></servicedata>
<param name="changesrevision">a7534f676c1da0c1591cc5c0f606fd6634b48af0</param></service><service name="tar_scm">
<param name="url">https://github.com/lkocman/openSUSE-repos.git</param>
<param name="changesrevision">0d4463391c611b7a7c3f158d4d58d6f2f54aafc1</param></service></servicedata>

3
openSUSE-repos-20230804.41e41a9.obscpio
View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5fd68f8cd5290206cec68fe531bd84c7b8658e1423d232bac888a1775bab587b
size 24586

3
openSUSE-repos-20230810.a7534f6.obscpio Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:258d9956823b19bbe8a3fa0fcaa762eaec789c0ec819e2142afbffcacce16a2d
size 25098

10
openSUSE-repos.changes
View File

@@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Aug 10 16:10:29 UTC 2023 - opensuse-releaseteam@opensuse.org
- Update to version 20230810.a7534f6:
* Disable NVIDIA pkg building on LeapMicro. Fixes #34
PM confirmed that NVIDIA related deployments are expected
to have all drivers/tools inside of container.
* Fix incorrect with_nvidia usage
-------------------------------------------------------------------
Fri Aug 04 09:12:36 UTC 2023 - opensuse-releaseteam@opensuse.org

6
openSUSE-repos.obsinfo
View File

@@ -1,4 +1,4 @@
name: openSUSE-repos
version: 20230804.41e41a9
mtime: 1691140250
commit: 41e41a99bdc5b3b5b5f4dc3588508f6e1fda6526
version: 20230810.a7534f6
mtime: 1691683765
commit: a7534f676c1da0c1591cc5c0f606fd6634b48af0

18
openSUSE-repos.spec
View File

@@ -26,6 +26,7 @@ ExclusiveArch: do_not_build
# Each openSUSE release package has a suggests for openSUSE-repos-$flavor.
%global flavor @BUILD_FLAVOR@%nil
%define with_nvidia 1
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
# Tumbleweed
%if "%flavor" == "openSUSE-repos-Tumbleweed"
@@ -49,6 +50,9 @@ ExclusiveArch: do_not_build
%if "%flavor" == "openSUSE-repos-LeapMicro"
%define theme LeapMicro
%define branding leap-micro
# Do not build for LeapMicro as per SLEM Product Management
# They expect NVIDIA related drivers and libs to be present inside the container
%define with_nvidia 0
%endif
%else
%if "%flavor" == "openSUSE-repos-Leap"
@@ -67,7 +71,7 @@ Name: openSUSE-repos
%else
Name: openSUSE-repos-%{theme}
%endif
Version: 20230804.41e41a9
Version: 20230810.a7534f6
Release: 0
Summary: openSUSE package repositories
License: MIT
@@ -79,7 +83,9 @@ BuildRequires: -post-build-checks
Requires: zypper
# Ensure we install matching packages on given distribution
# openSUSE-release has suggest on particular theme based on distribution
%if 0%{?with_nvidia}
Suggests: openSUSE-repos-%{theme}-NVIDIA
%endif
Conflicts: otherproviders(openSUSE-repos)
Provides: openSUSE-repos
%if "%{?theme}" == "Tumbleweed"
@@ -98,6 +104,7 @@ Obsoletes: openSUSE-repos-LeapMicro
%description
Definitions for openSUSE repository management via zypp-services
%if 0%{?with_nvidia}
%package NVIDIA
Summary: openSUSE NVIDIA repository definitions
Requires: openSUSE-repos
@@ -118,6 +125,7 @@ Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
%description NVIDIA
Definitions for NVIDIA repository management via zypp-services
%endif
%files
@@ -165,7 +173,7 @@ Definitions for NVIDIA repository management via zypp-services
%endif
%endif
%if "0%{?with_nvidia}"
%if 0%{?with_nvidia}
%files NVIDIA
%dir %{_datadir}/zypp/local/service/NVIDIA
%dir %{_datadir}/zypp/local/service/NVIDIA/repo
@@ -216,7 +224,7 @@ install opensuse-%{branding}-ports-repoindex.xml -pm 0644 %{buildroot}%{_datadir
%endif
%endif
%if "0%{?with_nvidia}"
%if 0%{?with_nvidia}
install nvidia-%{branding}-repoindex.xml -pm 0644 %{buildroot}%{_datadir}/zypp/local/service/NVIDIA/repo
%endif
@@ -300,7 +308,7 @@ done
# We hereby declare that running this will not influence existing transaction
ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/openSUSE openSUSE
%if "0%{?with_nvidia}"
%if 0%{?with_nvidia}
%post NVIDIA
ln -sf nvidia-%{branding}-repoindex.xml %{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
@@ -327,6 +335,7 @@ if [ "$1" = 0 ] ; then
fi
fi
%if 0%{?with_nvidia}
%postun NVIDIA
if [ "$1" = 0 ] ; then
# We hereby declare that running this will not influence existing transaction
@@ -335,5 +344,6 @@ if [ "$1" = 0 ] ; then
rm -f %{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
fi
fi
%endif
%changelog