git://git.onelab.eu
/
procprotect.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Setting tag procprotect-0.4-4
[procprotect.git]
/
procprotect.spec
diff --git
a/procprotect.spec
b/procprotect.spec
index
185b175
..
f567b3f
100644
(file)
--- a/
procprotect.spec
+++ b/
procprotect.spec
@@
-1,12
+1,15
@@
%define name procprotect
%define version 0.4
%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
### 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 )
# 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 )
%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}}
# 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
/usr/lib/systemd/system/procprotect.service
%post
-/sbin/depmod -a
+/sbin/depmod -a
%{kernel_id}
/bin/systemctl enable procprotect.service
%postun
%changelog
/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
* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - procprotect-0.4-3
- guarded against some hypothetically possible errors