trying out inotify-tools

diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 272b968..cce980f 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -5,6 +5,7 @@ linux-2.6-SVNPATH               := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/trunk
 util-vserver-SVNBRANCH         := scholz
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/branches/scholz
+libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/trunk
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/trunk
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/trunk
@@ -16,6 +17,7 @@ pf2slice-SVNPATH              := http://svn.planet-lab.org/svn/pf2slice/trunk
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/trunk
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/trunk
+inotify-tools-SVNPATH          := http://svn.planet-lab.org/svn/inotify-tools/trunk
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
 #vsys-SVNPATH                  := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-20
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk

diff --git a/planetlab.mk b/planetlab.mk
index 384fd2c..cfbf343 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -38,18 +38,6 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(KERNELS)
 
-#
-# kexec-tools
-#
-ifeq "$(DISTRONAME)" "fc4"
-kexec-tools-MODULES := kexec-tools
-kexec-tools-SPEC := kexec-tools.spec
-kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-kexec-tools-TAG := planetlab-4_1-rc2
-ALL += kexec-tools
-IN_BOOTCD += kexec-tools
-endif
-
 #
 # madwifi
 #
@@ -72,22 +60,32 @@ util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
 
+## #
+## # libnl - local import
+## # the version available in centos 5.2 is too old
+## # we need either 1.1 or at least 1.0.pre6
+## #
+## libnl-MODULES := libnl
+## libnl-SPEC := libnl.spec
+## ALL += libnl
+## IN_BOOTSTRAPFS += libnl
+
 #
 # util-vserver-pl
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core libnl-devel
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl
 
 #
 # NodeUpdate
 #
-NodeUpdate-MODULES := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate.spec
-ALL += NodeUpdate
-IN_BOOTSTRAPFS += NodeUpdate
+nodeupdate-MODULES := NodeUpdate
+nodeupdate-SPEC := NodeUpdate.spec
+ALL += nodeupdate
+IN_BOOTSTRAPFS += nodeupdate
 
 #
 # ipod
@@ -100,18 +98,18 @@ IN_BOOTSTRAPFS += ipod
 #
 # NodeManager
 #
-NodeManager-MODULES := NodeManager
-NodeManager-SPEC := NodeManager.spec
-ALL += NodeManager
-IN_BOOTSTRAPFS += NodeManager
+nodemanager-MODULES := NodeManager
+nodemanager-SPEC := NodeManager.spec
+ALL += nodemanager
+IN_BOOTSTRAPFS += nodemanager
 
 #
 # pl_sshd
 #
-pl_sshd-MODULES := pl_sshd
-pl_sshd-SPEC := pl_sshd.spec
-ALL += pl_sshd
-IN_BOOTSTRAPFS += pl_sshd
+sshd-MODULES := pl_sshd
+sshd-SPEC := pl_sshd.spec
+ALL += sshd
+IN_BOOTSTRAPFS += sshd
 
 #
 # codemux: Port 80 demux
@@ -140,10 +138,10 @@ ALL += pf2slice
 #
 # PlanetLab Mom: Cleans up your mess
 #
-pl_mom-MODULES := Mom
-pl_mom-SPEC := pl_mom.spec
-ALL += pl_mom
-IN_BOOTSTRAPFS += pl_mom
+mom-MODULES := Mom
+mom-SPEC := pl_mom.spec
+ALL += mom
+IN_BOOTSTRAPFS += mom
 
 #
 # iptables
@@ -165,26 +163,23 @@ IN_VSERVER += iproute
 IN_BOOTCD += iproute
 
 #
-# vsys
+# inotify-tools - local import
+# could not find this in cen
 #
-vsys_support=yes
-ifeq "$(DISTRONAME)" "fc4"
-vsys_support=
-endif
-ifeq "$(DISTRONAME)" "fc6"
-vsys_support=
-endif
-# cannot find the required packages (see devel.pkgs) on centos5
-ifeq "$(DISTRONAME)" "centos5"
-vsys_support=
-endif
+inotify-tools-MODULES := inotify-tools
+inotify-tools-SPEC := inotify-tools.spec
+inotify-tools-BUILD-FROM-SRPM := yes
+IN_BOOTSTRAPFS += inotify-tools
+ALL += inotify-tools
 
-ifeq "$(vsys_support)" "yes"
+#
+# vsys
+# should now work on f{8,9} , and even centos 5.2
+#
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
-endif
 
 #
 # PLCAPI
@@ -205,10 +200,10 @@ IN_MYPLC += PLCWWW
 #
 # monitor
 #
-Monitor-MODULES := Monitor
-Monitor-SPEC := Monitor.spec
-ALL += Monitor
-IN_BOOTSTRAPFS += Monitor
+monitor-MODULES := Monitor
+monitor-SPEC := Monitor.spec
+ALL += monitor
+IN_BOOTSTRAPFS += monitor
 
 #
 # monitor-server