catch up - continued

diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk
index 261192f..c90bcf0 100644 (file)
--- a/wextoolbox-tags.mk
+++ b/wextoolbox-tags.mk
@@ -17,6 +17,7 @@ madwifi-SVNPATH                       := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-4099-0
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.7-2
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.4.7-2
 iptables-BUILD-FROM-SRPM := yes        # tmp
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2

+ipfw-SVNPATH                  := http://svn.planet-lab.org/svn/ipfw/tags/ipfw-0.9-12

 util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2


@@ -33,7 +34,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 vsys-SVNBRANCH                 := 0.9
 vsys-SVNPATH                    := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-15
 vsys-SVNBRANCH                 := 0.9
 vsys-SVNPATH                    := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-15

-PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-8
+plcapi-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-8

 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-SVNPATH                  := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-43
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-SVNPATH                  := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-43
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 299ca33..e413108 100644 (file)
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -101,8 +101,6 @@ kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
 ### not needed with 2.6.27 anymore
 ### kernel-SPECVARS := iwlwifi=1
 endif
 ### not needed with 2.6.27 anymore
 ### kernel-SPECVARS := iwlwifi=1

-### tmp
-kernel-RPMDATE := yes

 KERNELS += kernel
 
 kernels: $(KERNELS)
 KERNELS += kernel
 
 kernels: $(KERNELS)


@@ -116,6 +114,24 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(KERNELS)
 
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(KERNELS)
 

+#
+# ipfw: root context module, and slice companion
+#
+ipfwroot-MODULES := ipfw
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
+ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwroot
+
+ipfwslice-MODULES := ipfw
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        kernel_arch=$(kernel.rpm-arch)
+ALL += ipfwslice
+

 #
 # madwifi
 #
 #
 # madwifi
 #


@@ -129,6 +145,25 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 

+#
+# iptables
+#
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+ALL += iptables
+IN_BOOTSTRAPFS += iptables
+
+#
+# iproute
+#
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
+

 #
 # util-vserver
 #
 #
 # util-vserver
 #


@@ -234,25 +269,6 @@ mom-SPEC := pl_mom.spec
 ALL += mom
 IN_BOOTSTRAPFS += mom
 
 ALL += mom
 IN_BOOTSTRAPFS += mom
 

-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-

 #
 # inotify-tools - local import
 # rebuild this on centos5 (not found) - see kexcludes in build.common
 #
 # inotify-tools - local import
 # rebuild this on centos5 (not found) - see kexcludes in build.common


@@ -292,10 +308,10 @@ ALL += vsys-scripts
 #
 # PLCAPI
 #
 #
 # PLCAPI
 #

-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := PLCAPI
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
+IN_MYPLC += plcapi

 
 #
 # drupal
 
 #
 # drupal


@@ -461,7 +477,7 @@ IN_MYPLC += noderepo
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #

-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC

 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc