X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=transforward.spec;h=4fe0bca88b48820f54b4454712ac5d3fdb8f75df;hb=5978857b8a1c6bac7b1d58c191088f0252640a49;hp=ac0d0d4402bc93af1902321c4600cdb7b6a2ba7c;hpb=71b2cf441369c34aff3033d39e1c79e27bc39eb4;p=transforward.git

diff --git a/transforward.spec b/transforward.spec
index ac0d0d4..4fe0bca 100644
--- a/transforward.spec
+++ b/transforward.spec
@@ -1,15 +1,39 @@
-%define url $URL$
-
 %define name transforward
 %define version 0.1
-%define taglevel 1
+%define taglevel 11
+
+### 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 )
+# causes recursive macro definition no matter how much you quote
+%define percent %
+%define braop \{
+%define bracl \}
+%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}}
+
+%define kernel_id %{kernel_version}-%{kernel_release}.%{kernel_arch}
+%define kernelpath /usr/src/kernels/%{kernel_id}
 
-%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
+Requires: kernel = %{kernel_version}-%{kernel_release}
 
 Summary: Kernel module that transparently forwards ports between containers
 Name: %{name}
@@ -19,6 +43,7 @@ License: GPL
 Group: System Environment/Kernel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Source0: transforward-%{version}.tar.gz
+Requires: kernel = %{kernel_version}-%{kernel_release}
 
 %description
 Kernel module that transparently forwards ports between containers
@@ -27,20 +52,56 @@ Kernel module that transparently forwards ports between containers
 %setup -q
 
 %build
-make -C /lib/modules/`ls /lib/modules | head -1`/build M=$PWD modules
+make -C %{kernelpath} V=1 M=$(pwd) KVER=%{kernel_id} modules
 
 %install
-mkdir -p $RPM_BUILD_ROOT/lib/modules/`ls /lib/modules | head -1`/kernel/net/transforward
-cp transforward.ko $RPM_BUILD_ROOT/lib/modules/`ls /lib/modules | head -1`/kernel/net/transforward
+install -D -m 755 transforward.ko $RPM_BUILD_ROOT/lib/modules/%{kernel_id}/net/transforward/transforward.ko
+install -D -m 644 transforward.conf $RPM_BUILD_ROOT/etc/modules-load.d/transforward.conf
+install -D -m 644 transforward.service $RPM_BUILD_ROOT/usr/lib/systemd/system/transforward.service
+install -D -m 755 transforward.init $RPM_BUILD_ROOT/usr/sbin/transforward.init
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-/lib
+/lib/modules/%{kernel_id}
+/etc/modules-load.d/transforward.conf
+/usr/lib/systemd/system/transforward.service
+/usr/sbin/transforward.init
 
 %post
+/sbin/depmod -a %{kernel_id}
+/bin/systemctl enable transforward.service
 
 %postun
 
 %changelog
+* Sun Jul 16 2017 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-11
+- no glock.h in kernel 4.9
+
+* Sun Jul 10 2016 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-10
+- fix to compile against linux 4.6 under f24
+
+* Fri Apr 03 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-9
+- only cleaned up the systemd unit file to remove ControlGroup:
+
+* Wed Feb 18 2015 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-8
+- add a requirement to the right kernel rpm
+
+* Wed Jul 16 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-7
+- tweak for building against a home-made kernel
+
+* Mon Apr 28 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-6
+- change to specfile so depmod gets called with the right kernel version
+
+* Fri Mar 21 2014 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-5
+- harmless (changed default build kernel to the latest kernel in use)
+
+* Wed Aug 28 2013 Sapan Bhatia <sapanb@cs.princeton.edu> - transforward-0.1-4
+- * Bug fixes, which should lead to increased stability
+- * Install via make and make install
+
+* Mon Jul 09 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - transforward-0.1-2
+- load module at boot-time
+- various tweaks, remove debugging statements
+