1
0

Accepting request 338367 from home:michal-m:branches:Base:System

- Revert change for fate#319339, as some 3rd party KMPs are built
  with a modified template (bsc#949862).

OBS-URL: https://build.opensuse.org/request/show/338367
OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-module-tools?expand=0&rev=27
This commit is contained in:
Marcus Meissner 2015-10-14 11:20:10 +00:00 committed by Git OBS Bridge
parent 58d0049314
commit e36f95d09a
3 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 13 08:35:32 UTC 2015 - mmarek@suse.cz
- Revert change for fate#319339, as some 3rd party KMPs are built
with a modified template (bsc#949862).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 8 12:44:33 UTC 2015 - trenn@suse.de Tue Sep 8 12:44:33 UTC 2015 - trenn@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package suse-module-tools # spec file for package suse-module-tools
# #
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed

View File

@ -247,9 +247,7 @@ find_kmps() {
local basename=$1 flavor=$2 local basename=$1 flavor=$2
local kmp local kmp
# Only consider KMPs that are built using the %kernel_module_package macro for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor"); do
# and have the _k<kver> string in their version
for kmp in $(rpm -qa --qf '%{n}-%{v}-%{r}\n' --nodigest --nosignature "$basename-kmp-$flavor" | grep '_k[1-9][^-]*-[^-]*$'); do
rpm -ql --nodigest --nosignature "$kmp" \ rpm -ql --nodigest --nosignature "$kmp" \
| grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \ | grep -Ee '^/lib/modules/[^/]+/.+\.ko$' \
> $tmpdir/modules-$kmp > $tmpdir/modules-$kmp