Accepting request 617095 from home:michals

- Add kernel export provides on openSUSE (boo#1095148).

OBS-URL: https://build.opensuse.org/request/show/617095
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=470
This commit is contained in:
Michael Schröder 2018-06-15 13:08:00 +00:00 committed by Git OBS Bridge
parent 04894f0153
commit 0dd6570819
3 changed files with 15 additions and 10 deletions

View File

@ -32,13 +32,13 @@
--- ./fileattrs/kernel.attr.orig 2017-12-01 15:46:28.172720497 +0000
+++ ./fileattrs/kernel.attr 2017-12-01 15:46:28.172720497 +0000
@@ -0,0 +1,2 @@
+%__kernel_provides %{_rpmconfigdir}/find-provides.ksyms --opensuse 0%{?is_opensuse}
+%__kernel_provides %{_rpmconfigdir}/find-provides.ksyms --tumbleweed %{?sle_version:0}%{!?sle_version:1}
+%__kernel_path ^(/lib/modules/[^/]*/kernel/.*\.ko(\.gz)?|/boot/vmlinu[xz].*)$
--- ./fileattrs/kmp.attr.orig 2017-12-01 15:46:28.172720497 +0000
+++ ./fileattrs/kmp.attr 2017-12-01 15:46:28.172720497 +0000
@@ -0,0 +1,4 @@
+%__kmp_provides %{_rpmconfigdir}/find-provides.ksyms --opensuse 0%{?is_opensuse}
+%__kmp_requires %{_rpmconfigdir}/find-requires.ksyms --suse-release 0%{?sle_version}
+%__kmp_provides %{_rpmconfigdir}/find-provides.ksyms --tumbleweed %{?sle_version:0}%{!?sle_version:1}
+%__kmp_requires %{_rpmconfigdir}/find-requires.ksyms --tumbleweed %{?sle_version:0}%{!?sle_version:1}
+%__kmp_supplements %{_rpmconfigdir}/find-supplements.ksyms
+%__kmp_path ^/lib/modules/[^/]*/(updates|extra)/.*\.ko(\.gz)?
--- ./fileattrs/perl.attr.orig 2017-08-10 08:08:07.113108701 +0000

View File

@ -23,16 +23,16 @@
+
+IFS=$'\n'
+
+is_opensuse=false
+is_tumbleweed=false
+
+if test "$1" = "--opensuse"; then
+if test "$1" = "--tumbleweed"; then
+ if test "$2" -gt 0; then
+ is_opensuse=true
+ is_tumbleweed=true
+ fi
+ shift 2
+fi
+
+if ! $is_opensuse; then
+if ! $is_tumbleweed; then
+ trap 'rm -f "$tmp"' EXIT
+ tmp=$(mktemp)
+fi
@ -58,7 +58,7 @@
+ *)
+ continue
+ esac
+ if $is_opensuse; then
+ if $is_tumbleweed; then
+ continue
+ fi
+ unzip=false
@ -109,8 +109,8 @@
+
+is_tumbleweed=false
+
+if test "$1" = "--suse-release"; then
+ if test "$2" -eq 0; then
+if test "$1" = "--tumbleweed"; then
+ if test "$2" -gt 0; then
+ is_tumbleweed=true
+ fi
+ shift 2

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 15 12:46:10 UTC 2018 - msuchanek@suse.com
- Add kernel export provides on openSUSE (boo#1095148).
-------------------------------------------------------------------
Fri Jun 15 13:25:18 CEST 2018 - mls@suse.de