X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=procprotect.spec;h=8623541d0a1c4e2fb7be2259dfdd0609080a418d;hb=822cc14ef32049a10016bc8ff31d5f5d3652662f;hp=c308b1ea1fe1d04937335892ca7ef874420cbd0f;hpb=66d7e95bfabaed2fc2ff8e15d9e357b30cf00498;p=procprotect.git

diff --git a/procprotect.spec b/procprotect.spec
index c308b1e..8623541 100644
--- a/procprotect.spec
+++ b/procprotect.spec
@@ -1,12 +1,15 @@
 %define name procprotect
 %define version 0.4
-%define taglevel 2
+%define taglevel 3
 
 ### legacy from locally-built kernels, used to define these
 # kernel_release : 1.fc16  (24 is then the planetlab taglevel)
 # 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}}
@@ -64,12 +68,15 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/systemd/system/procprotect.service
 
 %post
-/sbin/depmod -a
+/sbin/depmod -a %{kernel_id}
 /bin/systemctl enable procprotect.service
 
 %postun
 
 %changelog
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - procprotect-0.4-3
+- guarded against some hypothetically possible errors
+
 * Wed Aug 28 2013 Sapan Bhatia <sapanb@cs.princeton.edu> - procprotect-0.4-2
 - * Bug fixes that should lead to increased stability
 - * Install via make and make install