Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-08-18 15:44:44 +0200
committerMichal Marek <mmarek@suse.cz>2014-08-18 15:44:44 +0200
commit32dedf2e653a447932dd111e992e8250cd6dfa0e (patch)
tree4a2a653b14dd5978e3ae8beaff52164b9dba9a1f
parent1fd2cddaea74242b0bf93bb7038c75534ac30f84 (diff)
parent0134440a7040b5584e828c53e8d10dd2e515dccd (diff)
Merge branch 'packaging'
-rw-r--r--rpm/kernel-binary.spec.in6
-rw-r--r--rpm/kernel-obs-build.spec.in4
2 files changed, 5 insertions, 5 deletions
diff --git a/rpm/kernel-binary.spec.in b/rpm/kernel-binary.spec.in
index f714ea33e9..5dd74f927d 100644
--- a/rpm/kernel-binary.spec.in
+++ b/rpm/kernel-binary.spec.in
@@ -27,9 +27,9 @@
%include %_sourcedir/kernel-spec-macros
%define build_flavor @FLAVOR@
-%define build_default (%build_flavor == "default")
-%define build_xen (%build_flavor == "xen" || %build_flavor == "ec2")
-%define build_vanilla (%build_flavor == "vanilla")
+%define build_default ("%build_flavor" == "default")
+%define build_xen ("%build_flavor" == "xen" || "%build_flavor" == "ec2")
+%define build_vanilla ("%build_flavor" == "vanilla")
%define build_src_dir %my_builddir/linux-%srcversion
%define src_install_dir /usr/src/linux-%kernelrelease%variant
diff --git a/rpm/kernel-obs-build.spec.in b/rpm/kernel-obs-build.spec.in
index 49a1d62175..ac42e13d2f 100644
--- a/rpm/kernel-obs-build.spec.in
+++ b/rpm/kernel-obs-build.spec.in
@@ -34,7 +34,7 @@ BuildRequires: kernel-default
BuildRequires: kernel-xen
%endif
ExclusiveArch: @ARCHS@
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
# For SLE 11
BuildRequires: mkinitrd
BuildRequires: perl-Bootloader
@@ -105,7 +105,7 @@ ROOT=""
%define kernel_name Image
%endif
-%if 0%{?suse_version} < 1320
+%if 0%{?suse_version} < 1315
# For SLE 11
/sbin/mkinitrd $ROOT \
-m "$KERNEL_MODULES" \