X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=c5be23d7e5460de00dd1e756d3d1c7d32cc70dd7;hb=7b8aa7a55b2ecfd0004f5096e753c0c064e2e55d;hp=2910a78a94b7f790dd0d12e238f311ac0fbfb9f8;hpb=b3cbe8b32f3350e17daefdccbbacccd8c2aa5728;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 2910a78a..c5be23d7 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -77,18 +77,19 @@ 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
-nozomi-SPECVARS = kernel_release=$(kernel.rpm-release) 
+nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+	kernel_release=$(kernel.rpm-release) \
+	kernel_arch=$(kernel.rpm-arch)
 IN_BOOTSTRAPFS += nozomi
 ALL += nozomi
 
 #
 # comgt
 # 
-
 comgt-MODULES := comgt
 comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
@@ -239,6 +240,7 @@ IN_BOOTSTRAPFS += iproute
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+IN_BOOTSTRAPFS += vsys
 ifeq "$(DISTRO)" "Fedora"
 ifeq "$(RELEASE)" "7"
 ALL += vsys
@@ -259,11 +261,19 @@ IN_MYPLC += PLCAPI
 #
 # PLCWWW
 #
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
 
+#
+# nodeconfig
+#
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
+
 #
 # bootmanager
 #
@@ -304,7 +314,7 @@ vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += vserver
-IN_BOOTSTRAPFS := vserver
+IN_BOOTSTRAPFS += vserver
 
 #
 # bootstrapfs
@@ -318,6 +328,26 @@ bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
+#
+# noderepo
+#
+# all rpms resulting from packages marked as being in bootstrapfs and vserver
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+# replace space with +++
+SPACE=$(subst x, ,x)
+NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
+
+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
+noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+# not yet
+ALL += noderepo
+#IN_MYPLC += noderepo
+
 #
 # myplc : initial, chroot-based packaging
 #