commit 157a49517db702e8e03557b17341431f26962cbe

OBS-URL: https://build.opensuse.org/package/show/Kernel:stable/kernel-source?expand=0&rev=1233
2020-01-22 08:06:59 +00:00 · 2020-01-22 08:06:59 +00:00 · 1f92265d49
commit 1f92265d49
parent bb5c9e3631
34 changed files with 176 additions and 46 deletions
--- a/dtb-aarch64.changes
+++ b/dtb-aarch64.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/dtb-aarch64.spec
+++ b/dtb-aarch64.spec
@ -31,7 +31,7 @@
 Name:           dtb-aarch64
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
--- a/dtb-armv6l.changes
+++ b/dtb-armv6l.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/dtb-armv6l.spec
+++ b/dtb-armv6l.spec
@ -31,7 +31,7 @@
 Name:           dtb-armv6l
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
--- a/dtb-armv7l.changes
+++ b/dtb-armv7l.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/dtb-armv7l.spec
+++ b/dtb-armv7l.spec
@ -31,7 +31,7 @@
 Name:           dtb-armv7l
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
--- a/kernel-64kb.changes
+++ b/kernel-64kb.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-64kb.spec
+++ b/kernel-64kb.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-binary.spec.in
+++ b/kernel-binary.spec.in
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
--- a/kernel-debug.changes
+++ b/kernel-debug.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-debug.spec
+++ b/kernel-debug.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %ifarch ppc64
 Provides:       kernel-kdump = 2.6.28
 Obsoletes:      kernel-kdump <= 2.6.28
--- a/kernel-default.changes
+++ b/kernel-default.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-default.spec
+++ b/kernel-default.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %ifarch %ix86
 Provides:       kernel-smp = 2.6.17
 Obsoletes:      kernel-smp <= 2.6.17
--- a/kernel-docs.changes
+++ b/kernel-docs.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-docs.spec
+++ b/kernel-docs.spec
@ -33,7 +33,7 @@ License:        GPL-2.0
 Group:          Documentation/Man
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -63,7 +63,7 @@ BuildRequires:  texlive-zapfding
 %endif
 Url:            http://www.kernel.org/
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
--- a/kernel-kvmsmall.changes
+++ b/kernel-kvmsmall.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-kvmsmall.spec
+++ b/kernel-kvmsmall.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-lpae.changes
+++ b/kernel-lpae.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-lpae.spec
+++ b/kernel-lpae.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-obs-build.changes
+++ b/kernel-obs-build.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-obs-build.spec
+++ b/kernel-obs-build.spec
@ -45,7 +45,7 @@ BuildRequires:  util-linux
 %endif
 %endif
 %endif
-BuildRequires:  kernel%kernel_flavor-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+BuildRequires:  kernel%kernel_flavor-srchash-157a49517db702e8e03557b17341431f26962cbe

 %if 0%{?rhel_version}
 BuildRequires:  kernel
@ -66,7 +66,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
--- a/kernel-obs-qa.changes
+++ b/kernel-obs-qa.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-obs-qa.spec
+++ b/kernel-obs-qa.spec
@ -38,7 +38,7 @@ License:        GPL-2.0
 Group:          SLES
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
--- a/kernel-pae.changes
+++ b/kernel-pae.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-pae.spec
+++ b/kernel-pae.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %ifarch %ix86
 Provides:       kernel-bigsmp = 2.6.17
 Obsoletes:      kernel-bigsmp <= 2.6.17
--- a/kernel-source.changes
+++ b/kernel-source.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-source.spec
+++ b/kernel-source.spec
@ -32,7 +32,7 @@ License:        GPL-2.0
 Group:          Development/Sources
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -43,7 +43,7 @@ BuildRequires:  fdupes
 BuildRequires:  sed
 Requires(post): coreutils sed
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 Provides:       linux
 Provides:       multiversion(kernel)
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
--- a/kernel-syms.changes
+++ b/kernel-syms.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-syms.spec
+++ b/kernel-syms.spec
@ -27,7 +27,7 @@ Group:          Development/Sources
 Version:        5.4.13
 %if %using_buildservice
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -52,7 +52,7 @@ Requires:       kernel-pae-devel = %version-%source_rel
 %endif
 Requires:       pesign-obs-integration
 Provides:       %name = %version-%source_rel
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 Provides:       multiversion(kernel)
 Source:         README.KSYMS
 Requires:       kernel-devel%variant = %version-%source_rel
--- a/kernel-vanilla.changes
+++ b/kernel-vanilla.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-vanilla.spec
+++ b/kernel-vanilla.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/kernel-zfcpdump.changes
+++ b/kernel-zfcpdump.changes
@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:56:00 CET 2020 - msuchanek@suse.de
+
+- kernel-binary.spec.in: do not recommend firmware for kvmsmall and azure
+  flavor (boo#1161360).
+- commit dbe7b27
+
 -------------------------------------------------------------------
 Mon Jan 20 12:37:09 CET 2020 - msuchanek@suse.de

--- a/kernel-zfcpdump.spec
+++ b/kernel-zfcpdump.spec
@ -67,7 +67,7 @@ License:        GPL-2.0
 Group:          System/Kernel
 Version:        5.4.13
 %if 0%{?is_kotd}
-Release:        <RELEASE>.gf406189
+Release:        <RELEASE>.g157a495
 %else
 Release:        0
 %endif
@ -107,7 +107,9 @@ Provides:       multiversion(kernel)
 # owned by multiple packages now. The dependency is not correct wrt openSUSE
 # 11.2 - 11.4, but we primarily care about the supported upgrade path.
 Obsoletes:      %name-base < 3.1
+%if ("%build_flavor" != "kvmsmall") && ("%build_flavor" != "azure")
 Recommends: kernel-firmware
+%endif
 # The following is copied to the -base subpackage as well
 # BEGIN COMMON DEPS
 Requires(pre):  coreutils awk
@ -172,10 +174,10 @@ Conflicts:      hyper-v < 4
 Conflicts:      libc.so.6()(64bit)
 %endif
 Provides:       kernel = %version-%source_rel
-Provides:       kernel-%build_flavor-base-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
-Provides:       kernel-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       kernel-%build_flavor-base-srchash-157a49517db702e8e03557b17341431f26962cbe
+Provides:       kernel-srchash-157a49517db702e8e03557b17341431f26962cbe
 # END COMMON DEPS
-Provides:       %name-srchash-f4061893787daf94dff4c4f91e51f74fabbb016d
+Provides:       %name-srchash-157a49517db702e8e03557b17341431f26962cbe
 %obsolete_rebuilds %name
 Source0:        http://www.kernel.org/pub/linux/kernel/v5.x/linux-%srcversion.tar.xz
 Source2:        source-post.sh
--- a/4
+++ b/4
@ -1,3 +1,3 @@
-2020-01-20 11:56:56 +0000
-GIT Revision: f4061893787daf94dff4c4f91e51f74fabbb016d
+2020-01-21 08:04:09 +0000
+GIT Revision: 157a49517db702e8e03557b17341431f26962cbe
 GIT Branch: stable