Home Home > GIT Browse > linux-next
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Suchanek <msuchanek@suse.de>2019-08-22 23:37:43 +0200
committerMichal Suchanek <msuchanek@suse.de>2019-08-23 09:00:27 +0200
commit16f681684447be904591435ab799c46638bdcea8 (patch)
tree7d31e789aec913929bc16b9fcccef14ebb3e013a
parent36acf914e59f212a18a8dacf9bbcff4e6b065cfa (diff)
Pull packaging cleanup from mkubecek.
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
-rw-r--r--rpm/kernel-binary.spec.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index b07537c0cf..d7023de175 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -1053,7 +1053,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
/usr/src/linux-obj/%kmp_target_cpu
%endif
-%if ( "x%livepatch" != "x" ) && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
+%if "%livepatch" != "" && %CONFIG_SUSE_KERNEL_SUPPORTED == "y" && "%variant" == ""
%if %livepatch == kgraft
%define patch_package %{livepatch}-patch
%else
@@ -1062,7 +1062,7 @@ kernel module packages) against the %build_flavor flavor of the kernel.
%package %{livepatch}
Summary: Metapackage to pull in matching %patch_package package
Group: System/Kernel
-Requires: %patch_package-%(echo %version-%source_rel | sed 'y/\./_/')-%build_flavor
+Requires: %{patch_package}-%(echo %{version}-%{source_rel} | sed 'y/\./_/')-%{build_flavor}
Provides: kernel-default-kgraft = %version
Provides: kernel-xen-kgraft = %version
Provides: multiversion(kernel)
@@ -1080,7 +1080,7 @@ static, unlike the %{patch_package}-<kernel-version>-flavor package names.
%dir /lib/modules/%kernelrelease-%build_flavor
%endif
-%if 0%{?klp_symbols} && ( "x%livepatch" != "x" )
+%if 0%{?klp_symbols} && "%livepatch" != ""
%package %{livepatch}-devel
Summary: Kernel symbols file used during kGraft patch development
Group: System/Kernel