rework kernel build a bit

1 files changed, 22 insertions, 20 deletions

diff --git a/kernel.spec.template b/kernel.spec.template
index 618c762..52b466c 100644
--- a/kernel.spec.template
+++ b/kernel.spec.template
@@ -1,5 +1,7 @@
 %global debug_package %{nil}
 
+%define KVERREL %{version}-%{release}.%{_target_cpu}
+
 Name:           kernel-mainline
 License:        GPLv2
 Version:        @version@
@@ -15,12 +17,12 @@ BuildRequires:  openssl-devel
 BuildRequires:  pkgconfig(libelf)
 
 Requires:       grubby
-Provides:       kernel = %{version}-%{release}
+Provides:       kernel = %{KVERREL}
 
 %package headers
 Summary:        linux kernel, pure mainline, headers
-Obsoletes:      kernel-headers < %{version}-%{release}
-Provides:       kernel-headers = %{version}-%{release}
+Obsoletes:      kernel-headers < %{KVERREL}
+Provides:       kernel-headers = %{KVERREL}
 
 %description
 linux kernel, pure mainline
@@ -36,7 +38,7 @@ mkdir build
 make O=build defconfig
 cp %{SOURCE1} build/.config
 cat %{SOURCE2} >> build/.config
-echo "CONFIG_LOCALVERSION=\"-%{release}\"" >> build/.config
+echo "CONFIG_LOCALVERSION=\"-%{release}.%{_target_cpu}\"" >> build/.config
 make -C build olddefconfig
 make -C build %{?_smp_mflags}
 
@@ -49,36 +51,36 @@ make INSTALL_PATH=%{buildroot}/boot \
      -C build \
      install modules_install headers_install
 mv %{buildroot}/boot/System.map \
-   %{buildroot}/boot/System.map-%{version}-%{release}
+   %{buildroot}/boot/System.map-%{KVERREL}
 mv %{buildroot}/boot/vmlinuz \
-   %{buildroot}/boot/vmlinuz-%{version}-%{release}
-cp build/.config %{buildroot}/boot/config-%{version}-%{release}
+   %{buildroot}/boot/vmlinuz-%{KVERREL}
+cp build/.config %{buildroot}/boot/config-%{KVERREL}
 find %{buildroot}/usr -name .install      -print | xargs rm
 find %{buildroot}/usr -name ..install.cmd -print | xargs rm
 find %{buildroot}/lib/modules -name "*.ko"  | xargs strip --strip-debug
 find %{buildroot}/lib/modules -name "*.ko"  | xargs gzip -v
 
 %post
-echo "# new-kernel-pkg install %{version}-%{release}"
-/usr/sbin/new-kernel-pkg --package %{name} --install "%{version}-%{release}"
+echo "# new-kernel-pkg install %{KVERREL}"
+/usr/sbin/new-kernel-pkg --package %{name} --install "%{KVERREL}"
 
 %preun
-echo "# new-kernel-pkg remove %{version}-%{release}"
-/usr/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "%{version}-%{release}"
+echo "# new-kernel-pkg remove %{KVERREL}"
+/usr/sbin/new-kernel-pkg --rminitrd --rmmoddep --remove "%{KVERREL}"
 
 %posttrans
-echo "# new-kernel-pkg update %{version}-%{release}"
+echo "# new-kernel-pkg update %{KVERREL}"
 /usr/sbin/new-kernel-pkg --package %{name} --mkinitrd --dracut --depmod \
-	--update "%{version}-%{release}"
-echo "# new-kernel-pkg posttrans %{version}-%{release}"
-/usr/sbin/new-kernel-pkg --package %{name} --rpmposttrans "%{version}-%{release}"
+	--update "%{KVERREL}"
+echo "# new-kernel-pkg posttrans %{KVERREL}"
+/usr/sbin/new-kernel-pkg --package %{name} --rpmposttrans "%{KVERREL}"
 
 %files
-/boot/config-%{version}-%{release}
-/boot/vmlinuz-%{version}-%{release}
-/boot/System.map-%{version}-%{release}
-/lib/modules/%{version}-%{release}
-%ghost /boot/initramfs-%{version}-%{release}.img
+/boot/config-%{KVERREL}
+/boot/vmlinuz-%{KVERREL}
+/boot/System.map-%{KVERREL}
+/lib/modules/%{KVERREL}
+%ghost /boot/initramfs-%{KVERREL}.img
 
 %files headers
 /usr/include/*