git://git.onelab.eu
/
build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omf is now under git - cleanup svn keywords
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
49dca97
..
1d1d78f
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-42,15
+42,16
@@
IN_BOOTSTRAPFS += $(KERNELS)
#
# ipfw: root context module, and slice companion
#
#
# ipfw: root context module, and slice companion
#
-ipfwroot-MODULES := ipfw
src
+ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwroot
ipfwroot-SPEC := planetlab/ipfwroot.spec
ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwroot
+IN_BOOTSTRAPFS += ipfwroot
-ipfwslice-MODULES := ipfw
src
+ipfwslice-MODULES := ipfw
ipfwslice-SPEC := planetlab/ipfwslice.spec
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
ipfwslice-SPEC := planetlab/ipfwslice.spec
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
@@
-115,6
+116,9
@@
ALL += umts-frontend
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
+ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
+iptables-BUILD-FROM-SRPM := yes
+endif
iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
@@
-219,6
+223,15
@@
fprobe-ulog-SPEC := fprobe-ulog.spec
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
+#
+# DistributedRateLimiting
+#
+DistributedRateLimiting-MODULES := DistributedRateLimiting
+DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+ALL += DistributedRateLimiting
+IN_NODEREPO += DistributedRateLimiting
+
+
#
# pf2slice
#
#
# pf2slice
#
@@
-399,6
+412,13
@@
omf-resctl-SPEC := omf-resctl.spec
ALL += omf-resctl
IN_VSERVER += omf-resctl
ALL += omf-resctl
IN_VSERVER += omf-resctl
+#
+# OMF exp controller
+#
+omf-expctl-MODULES := omf
+omf-expctl-SPEC := omf-expctl.spec
+ALL += omf-expctl
+
#
# bootcd
#
#
# bootcd
#
@@
-436,7
+456,7
@@
ALL += bootstrapfs
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
# noderepo
#
# all rpms resulting from packages marked as being in bootstrapfs and vserver
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_
NODEREPO) $(IN_
VSERVER),$($(package).rpms))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
# replace space with +++ (specvars cannot deal with spaces)
SPACE=$(subst x, ,x)
NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
@@
-445,7
+465,7
@@
noderepo-MODULES := BootstrapFS
noderepo-SPEC := noderepo.spec
noderepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
noderepo-SPEC := noderepo.spec
noderepo-RPMBUILD := bash ./rpmbuild.sh
# package requires all embedded packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_
NODEREPO) $(IN_
VSERVER)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
noderepo-DEPEND-FILES := RPMS/yumgroups.xml
#export rpm list to the specfile
noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)