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
Setting tag bootcd-5.0-7
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
bc93785
..
45df395
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-56,9
+56,6
@@
ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwslice
kernel_arch=$(kernel.rpm-arch)
ALL += ipfwslice
-# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation
-# is madwifi still current anyway ? should we move to ath5k instead ?
-#ifneq "$(DISTRONAME)" "f12"
#
# madwifi
#
#
# madwifi
#
@@
-71,7
+68,6
@@
madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
kernel_arch=$(kernel.rpm-arch)
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#endif
#
# nozomi
#
# nozomi
@@
-175,7
+171,7
@@
IN_BOOTSTRAPFS += util-vserver-pl
#
# NodeUpdate
#
#
# NodeUpdate
#
-nodeupdate-MODULES :=
NodeU
pdate
+nodeupdate-MODULES :=
nodeu
pdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
nodeupdate-SPEC := NodeUpdate.spec
ALL += nodeupdate
IN_BOOTSTRAPFS += nodeupdate
@@
-191,7
+187,7
@@
IN_BOOTSTRAPFS += ipod
#
# NodeManager
#
#
# NodeManager
#
-nodemanager-MODULES :=
NodeM
anager
+nodemanager-MODULES :=
nodem
anager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
nodemanager-SPEC := NodeManager.spec
ALL += nodemanager
IN_BOOTSTRAPFS += nodemanager
@@
-262,6
+258,15
@@
IN_BOOTSTRAPFS += inotify-tools
ALL += inotify-tools
endif
ALL += inotify-tools
endif
+#
+# openvswitch
+#
+openvswitch-MODULES := openvswitch
+openvswitch-SPEC := openvswitch.spec
+openvswitch-DEPEND-DEVEL-RPMS := kernel-devel
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
+
#
# vsys
#
#
# vsys
#
@@
-366,7
+371,11
@@
ALL += pyaspects
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
ejabberd-BUILD-FROM-SRPM := yes
ejabberd-MODULES := ejabberd
ejabberd-SPEC := ejabberd.spec
ejabberd-BUILD-FROM-SRPM := yes
+# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
+# so, this is relevant on f8 and centos5 only
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
ALL += ejabberd
ALL += ejabberd
+endif
# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
build_sfa=true
# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
build_sfa=true
@@
-383,6
+392,10
@@
sfa-SPEC := sfa.spec
ALL += sfa
endif
ALL += sfa
endif
+sface-MODULES := sface
+sface-SPEC := sface.spec
+ALL += sface
+
#
# nodeconfig
#
#
# nodeconfig
#
@@
-447,7
+460,7
@@
IN_MYPLC += bootcd
#
# vserver : reference image for slices
#
#
# vserver : reference image for slices
#
-vserver-MODULES := vserverreference build
+vserver-MODULES := vserver
-
reference build
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
vserver-SPEC := vserver-reference.spec
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml