X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=procprotect.spec;h=f567b3fb3e21d8003f0a6b00fde231d547b5ae71;hb=9ed739cdca3fe2f2db821e872289ef88497ca989;hp=185b175b739e8188149b1a5bc6748d0f8f316adf;hpb=cd8c7b0fbc76c13975dc82d5eb2d9aadc8ee478f;p=procprotect.git

diff --git a/procprotect.spec b/procprotect.spec
index 185b175..f567b3f 100644
--- a/procprotect.spec
+++ b/procprotect.spec
@@ -1,12 +1,15 @@
 %define name procprotect
 %define version 0.4
-%define taglevel 3
+%define taglevel 4
 
 ### 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
+* Mon Apr 28 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - procprotect-0.4-4
+- change to specfile only, for running depmod with right kernel version
+
 * Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - procprotect-0.4-3
 - guarded against some hypothetically possible errors