X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=6314e1d0cad01078d43f8756be9cae7baa58100c;hb=acb9be1f98fed99f927d5c3063628166d6068972;hp=169cff9074bbcd18d1b1fcd151daa6cb0423260c;hpb=94bea8db3940979868e25affde141743cae3c669;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 169cff90..6314e1d0 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -181,6 +181,14 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_BOOTSTRAPFS += fprobe-ulog +# +# pf2slice +# +pf2slice-MODULES := pf2slice +pf2slice-SPEC := pf2slice.spec +ALL += pf2slice + + # # netflow # @@ -245,6 +253,14 @@ PLCWWW-SPEC := PLCWWW.spec ALL += PLCWWW IN_MYPLC += PLCWWW +# +# nodeconfig +# +nodeconfig-MODULES := nodeconfig +nodeconfig-SPEC := nodeconfig.spec +ALL += nodeconfig +IN_MYPLC += nodeconfig + # # bootmanager # @@ -299,6 +315,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 +++ (specvars cannot deal with spaces) +SPACE=$(subst x, ,x) +NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) + +noderepo-MODULES := BootstrapFS +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 +#export rpm list to the specfile +noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) +ALL += noderepo +IN_MYPLC += noderepo + # # myplc : initial, chroot-based packaging #