X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=d7d8eae0b2f96e4a266075df99bc1057c0713768;hb=aca5afbf22873bcd9d90a5da0db4f65b93babc0a;hp=c8dd83125a0dbadf0ecfff2e4f896c9bea230a59;hpb=0a9bdd1100ff92bc510977a365778e2ec8f00013;p=build.git diff --git a/onelab.mk b/onelab.mk index c8dd8312..d7d8eae0 100644 --- a/onelab.mk +++ b/onelab.mk @@ -202,6 +202,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 # @@ -333,7 +341,7 @@ IN_MYPLC += bootstrapfs # # 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 +++ +# replace space with +++ (specvars cannot deal with spaces) SPACE=$(subst x, ,x) NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) @@ -343,6 +351,7 @@ 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) # not yet ALL += noderepo