X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=f74dbf680454b04ee1aa2a03dabe5f4d0341ac6d;hb=79402a67035dc5bff06925be82dd273094125cec;hp=aac237eee906cb51a21683ad1b41ce4de21d87f2;hpb=5440f9679d0c8bc0f1da40905849aefe1ee7596b;p=build.git

diff --git a/onelab.mk b/onelab.mk
index aac237ee..f74dbf68 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -64,19 +64,9 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-#
-# wireless-tools
-# 
-wireless-tools-MODULES := wireless-tools
-wireless-tools-SPEC := wireless-tools.spec
-wireless-tools-BUILD-FROM-SRPM := yes
-ALL += wireless-tools
-IN_BOOTSTRAPFS += wireless-tools
-
 # 
 # nozomi
 # 
-# does not compile against new kernel - waiting for Napoli & Vimercate
 nozomi-MODULES := nozomi
 nozomi-SPEC := nozomi.spec
 nozomi-DEPEND-DEVEL-RPMS := kernel-devel
@@ -94,17 +84,6 @@ comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
 ALL += comgt
 
-#
-# 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
 #
@@ -119,7 +98,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
 
@@ -204,6 +183,8 @@ iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
 
 #
 # vsys
@@ -227,6 +208,14 @@ IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
 
+#
+# dummynet_image
+# 
+dummynet_image-MODULES := dummynet_image
+dummynet_image-SPEC := dummynet_image.spec
+IN_MYPLC += dummynet_image
+ALL += dummynet_image
+
 #
 # PLCAPI
 #
@@ -251,6 +240,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
 #
@@ -356,6 +352,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
+ALL += myplc-docs