X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=d592e29194cc11b0987c05417f656fd2ba94c7b9;hb=95a48481efe26b4c4385c29668c8c8c17ecc6ff1;hp=00119bfa0bb6a05af4f9d111e6bef1bc22f89cd0;hpb=cb0c921da4fce8d28d18a7e828913b590ae464d7;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 00119bfa..d592e291 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -63,17 +63,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# libnl
-#
-# [daniel]    wait for latest Fedora release 
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
-#
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
-
 #
 # util-vserver
 #
@@ -88,7 +77,7 @@ IN_BOOTSTRAPFS += util-vserver
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core
 ALL += util-vserver-pl
 IN_BOOTSTRAPFS += util-vserver-pl
 
@@ -172,6 +161,8 @@ iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
 
 #
 # vsys
@@ -219,6 +210,13 @@ Monitor-SPEC := Monitor.spec
 ALL += Monitor
 IN_BOOTSTRAPFS += Monitor
 
+#
+# monitor-server
+#
+monitor-server-MODULES := Monitor
+monitor-server-SPEC := monitor-server.spec
+ALL += monitor-server
+
 #
 # nodeconfig
 #
@@ -331,6 +329,9 @@ ALL += myplc-native
 ## myplc-RPMDATE := yes
 ## ALL += myplc
 
+# myplc-docs only contains docs for PLCAPI and NMAPI, but
+# we still need to pull MyPLC, as it is where the specfile lies, 
+# together with the utility script docbook2drupal.sh
 myplc-docs-MODULES := MyPLC PLCAPI NodeManager
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs