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:
2017-09-20 15:29:49 +00:00
committed by Git OBS Bridge
parent 9c2c23baec
commit 4b044876a1
10 changed files with 185 additions and 264 deletions

View File

@@ -4,11 +4,9 @@ that rpm does not allow in dependencies, such as commas. Encode those as
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Index: rpm-4.4.2.3/scripts/find-supplements.ksyms
===================================================================
--- scripts/find-supplements.ksyms
--- scripts/find-supplements.ksyms.orig
+++ scripts/find-supplements.ksyms
@@ -48,6 +48,21 @@ combine_modaliases() {
@@ -35,10 +35,26 @@ combine_modaliases() {
print_modaliases "$class" "$variants" "$pos"
}
@@ -27,14 +25,11 @@ Index: rpm-4.4.2.3/scripts/find-supplements.ksyms
+ done
+}
+
aliases_of_filelist() {
modlist=$(mktemp)
have_module=1
@@ -60,6 +75,7 @@ aliases_of_filelist() {
fi
have_module=0
/sbin/modinfo -F alias "$module" \
+ | hexenc \
| sed -nre "s,(.+:.+),modalias(kernel-${krel##*-}:\\1),p" | tee -a $modlist
done
if ! test -s "$modlist" && test $have_module = 0; then
for module in $(grep -E '/lib/modules/.+\.ko$' | grep -v '/lib/modules/[^/]*/kernel/'); do
vermagic=$(/sbin/modinfo -F vermagic "$module")
krel=${vermagic%% *}
/sbin/modinfo -F alias "$module" \
+ | hexenc \
| sed -nre "s,(.+:.+),modalias(kernel-${krel##*-}:\\1),p"
done \
| sort -u \