Accepting request 523080 from home:michal-m:branches:Base:System
- Generate ksym() dependencies for SLE if %is_opensuse is unset (bsc#981083). - Drop %supplements_kernel_module, as it is broken, undocumented and is not used by anybody (bsc#981083). dropped: modalias-kernel_module.diff refreshed: modalias-encode.diff - Split fileattrs for kernel and kmps, do not pass around %name and simplify the helpers refreshed: fileattrs.diff, modalias.diff dropped: symset-table, helperenv.diff, modalias-no-kgraft.diff OBS-URL: https://build.opensuse.org/request/show/523080 OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=403
This commit is contained in:
Git OBS Bridge
@@ -1,20 +1,34 @@
|
||||
--- ./fileattrs/Makefile.am.orig 2014-02-20 12:54:01.473814793 +0000
|
||||
+++ ./fileattrs/Makefile.am 2014-02-20 12:55:37.318814624 +0000
|
||||
@@ -7,6 +7,6 @@ fattrsdir = $(rpmconfigdir)/fileattrs
|
||||
---
|
||||
fileattrs/Makefile.am | 3 ++-
|
||||
fileattrs/debuginfo.attr | 2 ++
|
||||
fileattrs/elf.attr | 3 ++-
|
||||
fileattrs/elflib.attr | 4 ++++
|
||||
fileattrs/firmware.attr | 2 ++
|
||||
fileattrs/kernel.attr | 2 ++
|
||||
fileattrs/kmp.attr | 4 ++++
|
||||
fileattrs/perl.attr | 3 ++-
|
||||
fileattrs/perllib.attr | 3 ++-
|
||||
fileattrs/sysvinit.attr | 2 ++
|
||||
10 files changed, 24 insertions(+), 4 deletions(-)
|
||||
|
||||
--- fileattrs/Makefile.am.orig
|
||||
+++ fileattrs/Makefile.am
|
||||
@@ -7,6 +7,7 @@ fattrsdir = $(rpmconfigdir)/fileattrs
|
||||
fattrs_DATA = \
|
||||
appdata.attr desktop.attr elf.attr font.attr libtool.attr perl.attr \
|
||||
perllib.attr pkgconfig.attr python.attr ocaml.attr script.attr \
|
||||
- mono.attr
|
||||
+ mono.attr debuginfo.attr elflib.attr firmware.attr ksyms.attr sysvinit.attr
|
||||
+ mono.attr debuginfo.attr elflib.attr firmware.attr kernel.attr \
|
||||
+ kmp.attr sysvinit.attr
|
||||
|
||||
EXTRA_DIST = $(fattrs_DATA)
|
||||
--- ./fileattrs/debuginfo.attr.orig 2014-02-20 12:54:01.473814793 +0000
|
||||
+++ ./fileattrs/debuginfo.attr 2014-02-20 12:54:01.473814793 +0000
|
||||
--- /dev/null
|
||||
+++ fileattrs/debuginfo.attr
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__debuginfo_provides %{_rpmconfigdir}/debuginfo.prov
|
||||
+%__debuginfo_path ^/usr/lib/debug/
|
||||
--- ./fileattrs/elf.attr.orig 2012-11-07 12:55:24.000000000 +0000
|
||||
+++ ./fileattrs/elf.attr 2014-02-20 12:54:01.474814793 +0000
|
||||
--- fileattrs/elf.attr.orig
|
||||
+++ fileattrs/elf.attr
|
||||
@@ -1,4 +1,5 @@
|
||||
%__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
|
||||
%__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
|
||||
@@ -22,35 +36,40 @@
|
||||
+%__elf_magic ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*executable
|
||||
%__elf_flags exeonly
|
||||
+%__elf_exclude_path ^/usr/lib/debug/
|
||||
--- ./fileattrs/elflib.attr.orig 2014-02-20 12:54:01.474814793 +0000
|
||||
+++ ./fileattrs/elflib.attr 2014-02-20 12:54:01.474814793 +0000
|
||||
--- /dev/null
|
||||
+++ fileattrs/elflib.attr
|
||||
@@ -0,0 +1,4 @@
|
||||
+%__elflib_provides %{_rpmconfigdir}/elfdeps --assume-exec --provides %{?__filter_GLIBC_PRIVATE:--filter-private}
|
||||
+%__elflib_requires %{_rpmconfigdir}/elfdeps --assume-exec --requires %{?__filter_GLIBC_PRIVATE:--filter-private}
|
||||
+%__elflib_magic ^(setuid )?(setgid )?(sticky )?ELF (32|64)-bit.*shared object
|
||||
+%__elflib_exclude_path ^/usr/lib/debug/
|
||||
--- ./fileattrs/firmware.attr.orig 2014-02-20 12:54:01.474814793 +0000
|
||||
+++ ./fileattrs/firmware.attr 2014-02-20 12:54:01.474814793 +0000
|
||||
--- /dev/null
|
||||
+++ fileattrs/firmware.attr
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__firmware_provides %{_rpmconfigdir}/firmware.prov
|
||||
+%__firmware_path /lib/firmware/
|
||||
--- ./fileattrs/ksyms.attr.orig 2014-02-20 12:54:01.474814793 +0000
|
||||
+++ ./fileattrs/ksyms.attr 2014-02-20 12:54:01.474814793 +0000
|
||||
--- /dev/null
|
||||
+++ fileattrs/kernel.attr
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__kernel_provides %{_rpmconfigdir}/find-provides.ksyms --opensuse 0%{?is_opensuse}
|
||||
+%__kernel_path ^(/lib/modules/[^/]*/kernel/.*\.ko(\.gz)?|/boot/vmlinu[xz].*)$
|
||||
--- /dev/null
|
||||
+++ fileattrs/kmp.attr
|
||||
@@ -0,0 +1,4 @@
|
||||
+%__ksyms_provides %{_rpmconfigdir}/find-provides.ksyms %name
|
||||
+%__ksyms_requires %{_rpmconfigdir}/find-requires.ksyms %name
|
||||
+%__ksyms_supplements %{_rpmconfigdir}/find-supplements.ksyms %name
|
||||
+%__ksyms_path (/lib/modules/.*\.ko(\.gz)?)|(/boot/vmlinu[xz].*)$
|
||||
--- ./fileattrs/perl.attr.orig 2012-11-07 12:55:24.000000000 +0000
|
||||
+++ ./fileattrs/perl.attr 2014-02-20 12:54:01.474814793 +0000
|
||||
+%__kmp_provides %{_rpmconfigdir}/find-provides.ksyms --opensuse 0%{?is_opensuse}
|
||||
+%__kmp_requires %{_rpmconfigdir}/find-requires.ksyms --opensuse 0%{?is_opensuse}
|
||||
+%__kmp_supplements %{_rpmconfigdir}/find-supplements.ksyms
|
||||
+%__kmp_path ^/lib/modules/[^/]*/(updates|extra)/.*\.ko(\.gz)?
|
||||
--- fileattrs/perl.attr.orig
|
||||
+++ fileattrs/perl.attr
|
||||
@@ -1,3 +1,4 @@
|
||||
-%__perl_requires %{_rpmconfigdir}/perl.req
|
||||
+# disabled for now
|
||||
+#%__perl_requires %{_rpmconfigdir}/perl.req
|
||||
%__perl_magic ^.*[Pp]erl .*$
|
||||
%__perl_flags exeonly
|
||||
--- ./fileattrs/perllib.attr.orig 2014-02-05 13:04:01.000000000 +0000
|
||||
+++ ./fileattrs/perllib.attr 2014-02-20 12:54:01.475814793 +0000
|
||||
--- fileattrs/perllib.attr.orig
|
||||
+++ fileattrs/perllib.attr
|
||||
@@ -1,5 +1,6 @@
|
||||
%__perllib_provides %{_rpmconfigdir}/perl.prov
|
||||
-%__perllib_requires %{_rpmconfigdir}/perl.req
|
||||
@@ -59,8 +78,8 @@
|
||||
%__perllib_magic ^Perl[[:digit:]] module source.*
|
||||
%__perllib_path \\.pm$
|
||||
%__perllib_flags magic_and_path
|
||||
--- ./fileattrs/sysvinit.attr.orig 2014-02-20 12:54:01.475814793 +0000
|
||||
+++ ./fileattrs/sysvinit.attr 2014-02-20 12:54:01.475814793 +0000
|
||||
--- /dev/null
|
||||
+++ fileattrs/sysvinit.attr
|
||||
@@ -0,0 +1,2 @@
|
||||
+%__sysvinit_provides %{_rpmconfigdir}/sysvinitdeps.sh --provides
|
||||
+%__sysvinit_path ^/etc/init\.d/
|
||||
|
||||
Reference in New Issue
Block a user