nodeconfig: use 4.3 branch for -tags.mk and trunk (5.0) for the -k27-tags.mk

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 3047fa3..264ef89 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -37,8 +37,6 @@ ALL += $(KERNELS)
 IN_BOOTCD += $(KERNELS)
 IN_VSERVER += $(KERNELS)
 IN_BOOTSTRAPFS += $(KERNELS)
-# turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
 
 #
 # ipfw: root context module, and slice companion
@@ -276,7 +274,6 @@ ALL += vsys-scripts
 # 
 dummynet_image-MODULES := dummynet_image
 dummynet_image-SPEC := dummynet_image.spec
-IN_MYPLC += dummynet_image
 ALL += dummynet_image
 
 #
@@ -285,7 +282,6 @@ ALL += dummynet_image
 PLCAPI-MODULES := PLCAPI
 PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
-IN_MYPLC += PLCAPI
 
 #
 # drupal
@@ -294,7 +290,6 @@ drupal-MODULES := drupal
 drupal-SPEC := drupal.spec
 drupal-BUILD-FROM-SRPM := yes
 ALL += drupal
-IN_MYPLC += drupal
 
 #
 # use the plewww module instead
@@ -302,7 +297,6 @@ IN_MYPLC += drupal
 plewww-MODULES := PLEWWW
 plewww-SPEC := plewww.spec
 ALL += plewww
-IN_MYPLC += plewww
 
 #
 # www-register-wizard
@@ -310,7 +304,6 @@ IN_MYPLC += plewww
 www-register-wizard-MODULES := www-register-wizard
 www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
-IN_MYPLC += www-register-wizard
 
 #
 # pcucontrol
@@ -364,7 +357,6 @@ ALL += sfa
 nodeconfig-MODULES := nodeconfig build
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
-IN_MYPLC += nodeconfig
 
 #
 # bootmanager
@@ -372,7 +364,6 @@ IN_MYPLC += nodeconfig
 bootmanager-MODULES := BootManager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
-IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
@@ -389,7 +380,6 @@ pyplnet-MODULES := pyplnet
 pyplnet-SPEC := pyplnet.spec
 ALL += pyplnet
 IN_BOOTSTRAPFS += pyplnet
-IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
@@ -402,7 +392,6 @@ bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 bootcd-RPMDATE := yes
 ALL += bootcd
-IN_MYPLC += bootcd
 
 #
 # vserver : reference image for slices
@@ -425,7 +414,6 @@ bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 bootstrapfs-RPMDATE := yes
 ALL += bootstrapfs
-IN_MYPLC += bootstrapfs
 
 #
 # noderepo
@@ -446,12 +434,11 @@ noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
 noderepo-RPMDATE := yes
 ALL += noderepo
-IN_MYPLC += noderepo
 
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC build
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc