Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-08-23 09:11:49 -0400
committerJeff Mahoney <jeffm@suse.com>2017-08-23 09:11:49 -0400
commit43edc5287c87539e70b63ce0c0be479a8db68d10 (patch)
treed798625590b1d548721bc837a64a5180c330f372
parent3f6a0b22aa7aee44f5970078a561483e0e15612e (diff)
parent0b0b5c9c271387f85312f0ead5a4bd3915e8bc3c (diff)
Merge remote-tracking branch 'origin/packaging'
-rw-r--r--rpm/kernel-binary.spec.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index 15f41e570f..f5ab9e810f 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -102,6 +102,7 @@ Obsoletes: %name-base < 3.1
Requires(pre): coreutils awk
# For /usr/lib/module-init-tools/weak-modules2
Requires(post): suse-module-tools
+Recommends: kernel-firmware
# For depmod (modutils is a dependency provided by both module-init-tools and
# kmod-compat)
Requires(post): modutils
@@ -223,8 +224,6 @@ Provides: compat-ath9k = 3.0
%obsolete_kmp rt3592 2.4.1.1_3
%obsolete_kmp rt5390 2.4.0.4_3
%obsolete_kmp ath3k 1.0_3
-Obsoletes: ath3k-firmware <= 1.0
-Provides: ath3k-firmware = 1.0
%obsolete_kmp compat-wireless 3.12
%obsolete_kmp rts5229 1.08
%obsolete_kmp rts_pstor 1.11
@@ -726,6 +725,8 @@ if [ %CONFIG_MODULES = y ]; then
$(echo %srcversion | sed -r 's/^([0-9]+)\.([0-9]+).*/\1 \2/')
fi
+rm -rf %{buildroot}/lib/firmware
+
add_dirs_to_filelist() {
sed -rn '
# print file name