From 0dd65708198afef97e1d1c9532575c88bf80ba2bd1f65ea2de0c3137ebbc2509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Fri, 15 Jun 2018 13:08:00 +0000 Subject: [PATCH] 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 --- fileattrs.diff | 6 +++--- findksyms.diff | 14 +++++++------- rpm.changes | 5 +++++ 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/fileattrs.diff b/fileattrs.diff index dcf6e99..230fb2d 100644 --- a/fileattrs.diff +++ b/fileattrs.diff @@ -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 diff --git a/findksyms.diff b/findksyms.diff index cd66a6d..15ad9f0 100644 --- a/findksyms.diff +++ b/findksyms.diff @@ -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 diff --git a/rpm.changes b/rpm.changes index 22f5b6e..835e366 100644 --- a/rpm.changes +++ b/rpm.changes @@ -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