From: Thomas Dreibholz <dreibh@simula.no>
Date: Tue, 25 Mar 2014 14:39:09 +0000 (+0100)
Subject: Modified specfile similar to ipfwroot: if building with a custom kernel, take
X-Git-Tag: procprotect-0.4-4~2
X-Git-Url: http://git.onelab.eu/?p=procprotect.git;a=commitdiff_plain;h=a20473624b9a260533bd32dadbc073c38253cc65;hp=cd8c7b0fbc76c13975dc82d5eb2d9aadc8ee478f

Modified specfile similar to ipfwroot: if building with a custom kernel, take
the kernel version from the Makefile parameter instead of using "rpm -q".
---

diff --git a/procprotect.spec b/procprotect.spec
index 185b175..f74d940 100644
--- a/procprotect.spec
+++ b/procprotect.spec
@@ -7,6 +7,9 @@
 # kernel_version : 3.3.7
 # kernel_arch :    i686 | x86_64
 
+# when no custom kernel is being built, kernel_version is defined but empty
+%define _with_planetlab_kernel %{?kernel_version:1}%{!?kernel_version:0}
+%if ! %{_with_planetlab_kernel}
 # compute this with "rpm -q --qf .. kernel-devel" when with the stock kernel
 # this line below
 #%define module_release %( rpm -q --qf "%{version}" kernel-headers )
@@ -17,6 +20,7 @@
 %define kernel_version %( rpm -q --qf %{percent}%{braop}version%{bracl} kernel-headers )
 %define kernel_release %( rpm -q --qf %{percent}%{braop}release%{bracl} kernel-headers )
 %define kernel_arch %( rpm -q --qf %{percent}%{braop}arch%{bracl} kernel-headers )
+%endif
 
 # this is getting really a lot of stuff, could be made simpler probably
 %define release %{kernel_version}.%{kernel_release}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}