name fixup

2 files changed, 29 insertions, 25 deletions

diff --git a/kernel.spec.template b/kernel.spec.template
index e49f5bd..4dac9cb 100644
--- a/kernel.spec.template
+++ b/kernel.spec.template
@@ -1,6 +1,7 @@
 %global debug_package %{nil}
 
-%define KVERREL @version@-%{release}.%{_target_cpu}
+%define KNLVERS @knlvers@-%{release}.%{_target_cpu}
+%define RPMVERS %{version}-%{release}
 
 Name:           kernel-@variant@
 License:        GPLv2
@@ -17,12 +18,12 @@ BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig(libelf)
 
 Requires:       grubby
-Provides:       kernel = %{KVERREL}
+Provides:       kernel = %{RPMVERS}
 
 %package headers
 Summary:        linux kernel, @variant@, headers
-Obsoletes:      kernel-headers < %{KVERREL}
-Provides:       kernel-headers = %{KVERREL}
+Obsoletes:      kernel-headers < %{RPMVERS}
+Provides:       kernel-headers = %{RPMVERS}
 
 %description
 linux kernel, @variant@
@@ -53,16 +54,16 @@ make INSTALL_PATH=%{buildroot}/boot \
 
 # rename /boot files, add config
 mv %{buildroot}/boot/System.map \
-   %{buildroot}/boot/System.map-%{KVERREL}
+   %{buildroot}/boot/System.map-%{KNLVERS}
 mv %{buildroot}/boot/vmlinuz \
-   %{buildroot}/boot/vmlinuz-%{KVERREL}
-cp build/.config %{buildroot}/boot/config-%{KVERREL}
+   %{buildroot}/boot/vmlinuz-%{KNLVERS}
+cp build/.config %{buildroot}/boot/config-%{KNLVERS}
 
 # cleanup
 rm -rf %{buildroot}/lib/firmware
-rm -f %{buildroot}/lib/modules/%{KVERREL}/modules.*
-rm -f %{buildroot}/lib/modules/%{KVERREL}/source
-rm -f %{buildroot}/lib/modules/%{KVERREL}/build
+rm -f %{buildroot}/lib/modules/%{KNLVERS}/modules.*
+rm -f %{buildroot}/lib/modules/%{KNLVERS}/source
+rm -f %{buildroot}/lib/modules/%{KNLVERS}/build
 find %{buildroot}/usr -name .install      -print | xargs rm
 find %{buildroot}/usr -name ..install.cmd -print | xargs rm
 
@@ -71,28 +72,28 @@ find %{buildroot}/lib/modules -name "*.ko"  | xargs strip --strip-debug
 find %{buildroot}/lib/modules -name "*.ko"  | xargs gzip
 
 %post
-echo "# depmod %{KVERREL}"
-depmod -a "%{KVERREL}"
-echo "# new-kernel-pkg install %{name}-%{KVERREL}"
-/usr/sbin/new-kernel-pkg --package %{name} --install "%{KVERREL}"
+echo "# depmod %{KNLVERS}"
+depmod -a "%{KNLVERS}"
+echo "# new-kernel-pkg install %{name}-%{KNLVERS}"
+/usr/sbin/new-kernel-pkg --package %{name} --install "%{KNLVERS}"
 
 %preun
-echo "# new-kernel-pkg remove %{name}-%{KVERREL}"
-/usr/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "%{KVERREL}"
+echo "# new-kernel-pkg remove %{name}-%{KNLVERS}"
+/usr/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "%{KNLVERS}"
 
 %posttrans
-echo "# new-kernel-pkg update %{name}-%{KVERREL}"
+echo "# new-kernel-pkg update %{name}-%{KNLVERS}"
 /usr/sbin/new-kernel-pkg --package %{name} --mkinitrd --dracut --depmod \
-	--update "%{KVERREL}"
-echo "# new-kernel-pkg posttrans %{name}-%{KVERREL}"
-/usr/sbin/new-kernel-pkg --package %{name} --rpmposttrans "%{KVERREL}"
+	--update "%{KNLVERS}"
+echo "# new-kernel-pkg posttrans %{name}-%{KNLVERS}"
+/usr/sbin/new-kernel-pkg --package %{name} --rpmposttrans "%{KNLVERS}"
 
 %files
-/boot/config-%{KVERREL}
-/boot/vmlinuz-%{KVERREL}
-/boot/System.map-%{KVERREL}
-/lib/modules/%{KVERREL}
-%ghost /boot/initramfs-%{KVERREL}.img
+/boot/config-%{KNLVERS}
+/boot/vmlinuz-%{KNLVERS}
+/boot/System.map-%{KNLVERS}
+/lib/modules/%{KNLVERS}
+%ghost /boot/initramfs-%{KNLVERS}.img
 
 %files headers
 /usr/include/*
diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 5773197..3173fb4 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -3,12 +3,14 @@ tag="$(cd source; git describe)"
 echo "# git tag: ${tag}"
 version="${tag#v}"
 rpmvers="${version}"
+knlvers="${version}"
 release="${BUILD_NUMBER}"
 case $version in
 4.4.*)	variant="lts404";;
 4.9.*)	variant="lts409";;
 4.14.*)	variant="lts414";;
 *-rc*)	variant="candidate"
+	knlvers="${version%-*}.0-${version#*-}"
 	rpmvers="${version%-*}.0"
 	release="0.${version#*-}.${release}"
 	;;
@@ -28,6 +30,7 @@ echo "#   release : ${release}"
 echo "#"
 sed	-e "s/@variant@/${variant}/" \
 	-e "s/@version@/${version}/" \
+	-e "s/@knlvers@/${knlvers}/" \
 	-e "s/@rpmvers@/${rpmvers}/" \
 	-e "s/@release@/${release}/" \
 	< kernel.spec.template > kernel.spec