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
Update master of plcapi.
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
ae4fb59
..
109fb73
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-23,8
+23,6
@@
kernel-RPMFLAGS:= --target i686
else
kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
else
kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
-# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
-kernel-SPECVARS += iwlwifi=1
kernel-SPECVARS += kernelconfig=planetlab
KERNELS += kernel
kernel-SPECVARS += kernelconfig=planetlab
KERNELS += kernel
@@
-59,6
+57,9
@@
ALL += ipfwslice
#
# madwifi
#
#
# madwifi
#
+# skip this with k32/f8
+ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+ifneq "$(DISTRONAME)" "f8"
madwifi-MODULES := madwifi
madwifi-SPEC := madwifi.spec
madwifi-BUILD-FROM-SRPM := yes
madwifi-MODULES := madwifi
madwifi-SPEC := madwifi.spec
madwifi-BUILD-FROM-SRPM := yes
@@
-68,6
+69,8
@@
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
+endif
#
# comgt
#
# comgt
@@
-98,7
+101,7
@@
ALL += umts-frontend
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-BUILD-FROM-SRPM := yes
+iptables-BUILD-FROM-SRPM := yes
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
@@
-108,7
+111,7
@@
IN_BOOTSTRAPFS += iptables
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
-iproute-BUILD-FROM-SRPM
:= yes
+iproute-BUILD-FROM-SRPM
:= yes
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += iproute
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += iproute
@@
-208,11
+211,13
@@
IN_BOOTSTRAPFS += fprobe-ulog
#
# DistributedRateLimiting
#
#
# DistributedRateLimiting
#
+# on f16 somehow configure screws up and defines LDFLAGS=-Wl,-z,relro which ld does not like..
+ifneq "$(DISTRONAME)" "f16"
DistributedRateLimiting-MODULES := DistributedRateLimiting
DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
ALL += DistributedRateLimiting
IN_NODEREPO += DistributedRateLimiting
DistributedRateLimiting-MODULES := DistributedRateLimiting
DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
ALL += DistributedRateLimiting
IN_NODEREPO += DistributedRateLimiting
-
+endif
#
# pf2slice
#
# pf2slice
@@
-238,6
+243,10
@@
ifeq "$(DISTRONAME)" "centos5"
local_inotify_tools=true
endif
local_inotify_tools=true
endif
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
+
ifeq "$(local_inotify_tools)" "true"
inotify-tools-MODULES := inotify-tools
inotify-tools-SPEC := inotify-tools.spec
ifeq "$(local_inotify_tools)" "true"
inotify-tools-MODULES := inotify-tools
inotify-tools-SPEC := inotify-tools.spec
@@
-252,7
+261,8
@@
endif
openvswitch-MODULES := openvswitch
openvswitch-SPEC := openvswitch.spec
openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
openvswitch-MODULES := openvswitch
openvswitch-SPEC := openvswitch.spec
openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_BOOTSTRAPFS += openvswitch
+# maybe not in production yet
+#IN_BOOTSTRAPFS += openvswitch
ALL += openvswitch
#
ALL += openvswitch
#
@@
-268,6
+278,14
@@
endif
IN_BOOTSTRAPFS += vsys
ALL += vsys
IN_BOOTSTRAPFS += vsys
ALL += vsys
+#
+# vsyssh : installed in slivers
+#
+vsyssh-MODULES := vsys
+vsyssh-SPEC := vsyssh.spec
+IN_SLIVER += vsyssh
+ALL += vsyssh
+
#
# vsys-scripts
#
#
# vsys-scripts
#
@@
-325,16
+343,6
@@
monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
IN_BOOTSTRAPFS += monitor
ALL += monitor
IN_BOOTSTRAPFS += monitor
-#
-# zabbix
-#
-zabbix-MODULES := monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-zabbix-DEVEL-RPMS += python-cherrypy
-### turn this off as zabbix comes with stock fedora or epel
-###ALL += zabbix
-
#
# PLC RT
#
#
# PLC RT
#
@@
-342,6
+350,8
@@
plcrt-MODULES := PLCRT
plcrt-SPEC := plcrt.spec
ALL += plcrt
plcrt-SPEC := plcrt.spec
ALL += plcrt
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
#
# pyopenssl
#
#
# pyopenssl
#
@@
-349,6
+359,7
@@
pyopenssl-MODULES := pyopenssl
pyopenssl-SPEC := pyOpenSSL.spec
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
pyopenssl-SPEC := pyOpenSSL.spec
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
+endif
#
# pyaspects
#
# pyaspects
@@
-524,12
+535,13
@@
ALL += slicerepo
#
myplc-MODULES := myplc
myplc-SPEC := myplc.spec
#
myplc-MODULES := myplc
myplc-SPEC := myplc.spec
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
ALL += myplc
# myplc-docs only contains docs for PLCAPI and NMAPI, but
# we still need to pull MyPLC, as it is where the specfile lies,
# together with the utility script docbook2drupal.sh
-myplc-docs-MODULES := myplc plcapi nodemanager
M
onitor
+myplc-docs-MODULES := myplc plcapi nodemanager
m
onitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs