X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fipfwroot.spec;h=f48c19d303550b0a338c7541fe1c24ea463e8db8;hb=1a1de26cc80cb0bc11cabbb7326c9bdb4800bdb8;hp=ca0eeaa43228b45ed581ca047da567eabbd3e42d;hpb=ed25366da0e7a8cab426294c0b9b47176d2abdd7;p=ipfw.git diff --git a/planetlab/ipfwroot.spec b/planetlab/ipfwroot.spec index ca0eeaa..f48c19d 100644 --- a/planetlab/ipfwroot.spec +++ b/planetlab/ipfwroot.spec @@ -1,26 +1,36 @@ # -# $Id: ipfwroot.spec 16174 2009-12-15 13:38:15Z marta $ -# -# TODO: -# restart crond -# -%define url $URL$ - # Marta Carbone # 2009 - Universita` di Pisa # License is BSD. +# +# xxx: TODO restart crond +# + # kernel_release, kernel_version and kernel_arch are expected to be set by the build to e.g. -# kernel_release : vs2.3.0.29.1.planetlab -# kernel_version : 2.6.22.14 +# kernel_release : 24.onelab (24 is then the planetlab taglevel) +# kernel_version : 2.6.27.57 | 2.6.32 (57 in the 27 case is the patch level) +# kernel_arch : i686 | x86_64 %define name ipfwroot %define version 0.9 -%define taglevel 10 +%define taglevel 21 + +# we need to make sure that this rpm gets upgraded when the kernel release changes +%define pl_kernel_taglevel %( echo %{kernel_release} | cut -d. -f1 ) -%define release %{kernel_version}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} -%define kernel_id_arch %{kernel_version}-%{kernel_release}-%{kernel_arch} -%define kernel_id %{kernel_version}-%{kernel_release} +%define release %{kernel_version}.%{pl_kernel_taglevel}.%{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} + +# guess which convention is used; k27 and before used dash, k32 uses dot +%define kernelpath_dash /usr/src/kernels/%{kernel_version}-%{kernel_release}-%{kernel_arch} +%define kernelpath_dot /usr/src/kernels/%{kernel_version}-%{kernel_release}.%{kernel_arch} +%define kernelpath %( [ -d %{kernelpath_dot} ] && echo %{kernelpath_dot} || echo %{kernelpath_dash} ) + +# the k32 kernel currently builds e.g. /lib/modules/2.6.32-0.onelab.2010.12.07-i686 +# the k27 and before does not have the -i686 part +%define kernel_id_old %{kernel_version}-%{kernel_release} +%define kernel_id_new %{kernel_version}-%{kernel_release}.%{kernel_arch} +%define kernel_id %( [ -d %{kernelpath_dot} ] && echo %{kernel_id_new} || echo %{kernel_id_old} ) Summary: ipfw and dummynet for Linux Name: %{name} @@ -32,12 +42,13 @@ Source0: %{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires: vixie-cron Requires: vsys-scripts +Obsoletes: ipfw Vendor: unipi Packager: PlanetLab # XXX ask Distribution: PlanetLab %{plrelease} -URL: %(echo %{url} | cut -d ' ' -f 2) +URL: %{SCMURL} %description ipfw is the Linux port of the FreeBSD ipfw and dummynet packages @@ -49,9 +60,6 @@ ipfw is the Linux port of the FreeBSD ipfw and dummynet packages # clean the rpm build directory rm -rf $RPM_BUILD_ROOT -# with the new build, we use the kernel-devel rpm for building -%define kernelpath /usr/src/kernels/%{kernel_id_arch} - %__make KERNELPATH=%kernelpath clean %__make KERNELPATH=%kernelpath IPFW_PLANETLAB=1 @@ -61,18 +69,21 @@ install -D -m 755 ipfw/ipfw $RPM_BUILD_ROOT/sbin/ipfw install -D -m 644 planetlab/ipfw.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/ipfw.cron install -D -m 755 planetlab/ipfw $RPM_BUILD_ROOT/etc/rc.d/init.d/ipfw +%clean +rm -rf $RPM_BUILD_ROOT + %post -# load the module +### this script is also triggered while the node image is being created at build-time +# some parts of the script do not make sense in this context +# this is why the build exports PL_BOOTCD=1 in such cases depmod -a -modprobe ipfw_mod -# clean the old database and initialize the firewall -echo "super dbcleanup" | /vsys/ipfw-be root -echo "super init" | /vsys/ipfw-be root -# add ipfw to chkconfig /sbin/chkconfig --add ipfw +# start the service if not building +[ -z "$PL_BOOTCD" ] && service ipfw start -%clean -rm -rf $RPM_BUILD_ROOT +%postun +# stop the service if not building +[ -z "$PL_BOOTCD" ] && service ipfw stop # here there is a list of the final installation directories %files @@ -81,12 +92,36 @@ rm -rf $RPM_BUILD_ROOT /lib/modules/%{kernel_id}/net/netfilter/ipfw_mod.ko /sbin/ipfw %{_sysconfdir}/cron.d/ipfw.cron - -%postun -# unload the module if present -LOADED=`cat /proc/modules | grep ^ipfw_mod`; if [ -n "$LOADED" ] ; then rmmod ipfw_mod; fi +/etc/rc.d/init.d/ipfw %changelog +* Fri Jun 10 2011 Thierry Parmentelat - ipfw-0.9-21 +- build tweaks for gcc-4.6 on f15 + +* Sun Jan 23 2011 Thierry Parmentelat - ipfw-0.9-20 +- tweaks for compiling on k32/64 bits + +* Wed Dec 08 2010 Thierry Parmentelat - ipfw-0.9-19 +- fix detection of kernel conventions + +* Tue Dec 07 2010 Thierry Parmentelat - ipfw-0.9-18 +- guess conventions for either <=k27 or >=k32 + +* Tue Jun 15 2010 Baris Metin - ipfw-0.9-17 +- testing git only module-tag + +* Tue Jun 15 2010 Baris Metin - ipfw-0.9-16 +- tagging ipfw to test module-tools on (pure) git + +* Wed May 12 2010 Talip Baris Metin - ipfw-0.9-15 +- tagging for obsoletes + +* Tue Apr 27 2010 Thierry Parmentelat - ipfw-0.9-13 +- Update to the ipfw3 version of the dummynet code. + +* Mon Apr 12 2010 Thierry Parmentelat - ipfw-0.9-11 +- add ipfw initialization script to chkconfig + * Wed Mar 03 2010 Talip Baris Metin - ipfw-0.9-10 - - Load module at installation - Marta