From a20473624b9a260533bd32dadbc073c38253cc65 Mon Sep 17 00:00:00 2001 From: Thomas Dreibholz Date: Tue, 25 Mar 2014 15:39:09 +0100 Subject: [PATCH 1/1] Modified specfile similar to ipfwroot: if building with a custom kernel, take the kernel version from the Makefile parameter instead of using "rpm -q". --- procprotect.spec | 4 ++++ 1 file changed, 4 insertions(+) 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}} -- 2.43.0