renaming WWW module into PLCWWW

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 659756d..ec5fcb2 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -240,6 +240,7 @@ IN_BOOTSTRAPFS += iproute
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+IN_BOOTSTRAPFS += vsys
 ifeq "$(DISTRO)" "Fedora"
 ifeq "$(RELEASE)" "7"
 ALL += vsys
@@ -260,7 +261,7 @@ IN_MYPLC += PLCAPI
 #
 # PLCWWW
 #
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
@@ -319,23 +320,6 @@ bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
-#
-# noderepo
-#
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
-noderepo.list:
-       @for rpm in $(NODEREPO_RPMS) ; do echo $rpm ; done > $@
-
-noderepo-MODULES := BootstrapFS build
-noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
-noderepo-DEPEND-FILES := RPMS/yumgroups.xml noderepo.list
-# not yet
-#ALL += noderepo
-#IN_MYPLC += noderepo
-
 #
 # myplc : initial, chroot-based packaging
 #