iptables branch 1.4.1.1 is not referenced any more

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index a7b08d0..77333b0 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -56,9 +56,6 @@ IN_BOOTSTRAPFS += madwifi
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
-ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
-util-vserver-BUILD-FROM-SRPM := yes
-endif
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
@@ -172,9 +169,6 @@ IN_BOOTSTRAPFS += mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-ifeq "$(PLDISTROTAGS)" "planetlab-k27-tags.mk"
-iptables-BUILD-FROM-SRPM := yes
-endif
 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -297,6 +291,23 @@ pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
 
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
+
+#
+# ejabberd
+#
+ejabberd-MODULES := ejabberd
+ejabberd-SPEC := ejabberd.spec
+ejabberd-BUILD-FROM-SRPM := yes
+ALL += ejabberd
+
+
 #
 # sfa - Slice Facility Architecture
 #
@@ -309,7 +320,7 @@ ALL += sfa
 #
 # xxx needed when upgrading to 5.0
 #nodeconfig-MODULES := nodeconfig
-nodeconfig-MODULES := nodeconfig build
+nodeconfig-MODULES := nodeconfig
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
 IN_MYPLC += nodeconfig
@@ -340,6 +351,23 @@ IN_BOOTSTRAPFS += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+
+#
+# OMF resource controller
+#
+omf-resctl-MODULES := omf
+omf-resctl-SPEC := omf-resctl.spec
+ALL += omf-resctl
+IN_VSERVER += omf-resctl
+
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
+
 #
 # bootcd
 #
@@ -399,9 +427,7 @@ IN_MYPLC += noderepo
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-# xxx needed when upgrading to 5.0
-#myplc-MODULES := MyPLC
-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc