summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 6e040d94c..5d0669379 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1529,11 +1529,12 @@ BuildKernel() {
MakeTarget=$1
KernelImage=$2
Flavour=$3
+ Flav=${Flavour:+.${Flavour}}
InstallName=${4:-vmlinuz}
# Pick the right config file for the kernel we're building
Config=kernel-%{version}-%{_target_cpu}${Flavour:+-${Flavour}}.config
- DevelDir=/usr/src/kernels/%{KVERREL}${Flavour:+.${Flavour}}
+ DevelDir=/usr/src/kernels/%{KVERREL}${Flav}
# When the bootable image is just the ELF kernel, strip it.
# We already copy the unstripped file into the debuginfo package.
@@ -1543,7 +1544,7 @@ BuildKernel() {
CopyKernel=cp
fi
- KernelVer=%{version}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}
+ KernelVer=%{version}-%{release}.%{_target_cpu}${Flav}
echo BUILDING A KERNEL FOR ${Flavour} %{_target_cpu}...
%if 0%{?stable_update}
@@ -1552,7 +1553,7 @@ BuildKernel() {
%endif
# make sure EXTRAVERSION says what we want it to say
- perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile
+ perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{release}.%{_target_cpu}${Flav}/" Makefile
# if pre-rc1 devel kernel, must fix up PATCHLEVEL for our versioning scheme
%if !0%{?rcrev}
@@ -1747,9 +1748,9 @@ BuildKernel() {
# __debug_install_post macro below to sign the right things
# Also save the signing keys so we actually sign the modules with the
# right key.
- cp -r .tmp_versions .tmp_versions.sign${Flavour:+.${Flavour}}
- cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
- cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}
+ cp -r .tmp_versions .tmp_versions.sign${Flav}
+ cp signing_key.priv signing_key.priv.sign${Flav}
+ cp signing_key.x509 signing_key.x509.sign${Flav}
%endif
# remove files that will be auto generated by depmod at rpm -i time