From 3cbbd53565bc3ade9a9ce4ea1ae8d1836c483b8d Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Thu, 14 Jun 2012 02:52:26 +0200
Subject: [PATCH] spec: fix vm-kernel dir name
Use simple x.y.z-r instead of x.y.z-r.pvops.qubes
---
kernel.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/kernel.spec b/kernel.spec
index 425e3b2..ee5c0a5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -4,7 +4,8 @@
#%define _unpackaged_files_terminate_build 0
%define variant %{build_flavor}.qubes
-%define rel %(cat rel-%{build_flavor}).%{variant}
+%define plainrel %(cat rel-%{build_flavor})
+%define rel %{plainrel}.%{variant}
%define version %(cat version-%{build_flavor})
%define _buildshell /bin/bash
@@ -19,7 +20,7 @@
%define build_src_dir %my_builddir/linux-%version
%define src_install_dir /usr/src/kernels/%kernelrelease
%define kernel_build_dir %my_builddir/linux-obj
-%define vm_install_dir /var/lib/qubes/vm-kernels/%version-%rel
+%define vm_install_dir /var/lib/qubes/vm-kernels/%version-%{plainrel}
%(chmod +x %_sourcedir/{guards,apply-patches,check-for-config-changes})
@@ -436,7 +437,7 @@ umount /tmp/qubes-modules-%kernelrelease
rmdir /tmp/qubes-modules-%kernelrelease
mv /tmp/qubes-modules-%kernelrelease.img %vm_install_dir/modules.img
-qubes-prefs --set default-kernel %version
+qubes-prefs --set default-kernel %version-%plainrel
%files qubes-vm
%defattr(-, root, root)