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
harmonize names for devel-rpms - was confusing - now has LOCAL-DEVEL-RPMS and STOCK...
[build.git]
/
onelab.mk
diff --git
a/onelab.mk
b/onelab.mk
index
4ccb77b
..
23abb0b
100644
(file)
--- a/
onelab.mk
+++ b/
onelab.mk
@@
-40,7
+40,7
@@
IN_NODEIMAGE += $(KERNELS)
#
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
#
ipfwroot-MODULES := ipfw
ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-
DEPEND
-DEVEL-RPMS += kernel-devel
+ipfwroot-
LOCAL-STOCK
-DEVEL-RPMS += kernel-devel
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
@@
-60,7
+60,7
@@
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
-madwifi-
DEPEND
-DEVEL-RPMS += kernel-devel
+madwifi-
LOCAL-STOCK
-DEVEL-RPMS += kernel-devel
madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
kernel_release=$(kernel.rpm-release) \
kernel_arch=$(kernel.rpm-arch)
@@
-99,7
+99,7
@@
ALL += umts-frontend
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
iptables-BUILD-FROM-SRPM := yes
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
iptables-BUILD-FROM-SRPM := yes
-iptables-
DEPEND
-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-
LOCAL-STOCK
-DEVEL-RPMS += kernel-devel kernel-headers
ALL += iptables
IN_NODEIMAGE += iptables
ALL += iptables
IN_NODEIMAGE += iptables
@@
-143,7
+143,7
@@
libnl-MODULES := libnl
libnl-SPEC := libnl.spec
libnl-BUILD-FROM-SRPM := yes
# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
libnl-SPEC := libnl.spec
libnl-BUILD-FROM-SRPM := yes
# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-
DEPEND
-DEVEL-RPMS += kernel-devel kernel-headers
+libnl-
LOCAL-STOCK
-DEVEL-RPMS += kernel-devel kernel-headers
ALL += libnl
IN_NODEIMAGE += libnl
endif
ALL += libnl
IN_NODEIMAGE += libnl
endif
@@
-153,9
+153,9
@@
endif
#
util-vserver-pl-MODULES := util-vserver-pl
util-vserver-pl-SPEC := util-vserver-pl.spec
#
util-vserver-pl-MODULES := util-vserver-pl
util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-
DEPEND
-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core
+util-vserver-pl-
LOCAL-STOCK
-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core
ifeq "$(local_libnl)" "true"
ifeq "$(local_libnl)" "true"
-util-vserver-pl-
DEPEND
-DEVEL-RPMS += libnl libnl-devel
+util-vserver-pl-
LOCAL-STOCK
-DEVEL-RPMS += libnl libnl-devel
endif
ALL += util-vserver-pl
IN_NODEIMAGE += util-vserver-pl
endif
ALL += util-vserver-pl
IN_NODEIMAGE += util-vserver-pl
@@
-273,7
+273,7
@@
endif
# #
# openvswitch-MODULES := openvswitch
# openvswitch-SPEC := openvswitch.spec
# #
# openvswitch-MODULES := openvswitch
# openvswitch-SPEC := openvswitch.spec
-# openvswitch-
DEPEND
-DEVEL-RPMS += kernel-devel
+# openvswitch-
LOCAL-STOCK
-DEVEL-RPMS += kernel-devel
#
# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
# IN_NODEIMAGE += openvswitch
#
# ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
# IN_NODEIMAGE += openvswitch
@@
-286,9
+286,9
@@
endif
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it
-vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
+vsys-
STOCK-
DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
ifeq "$(local_inotify_tools)" "true"
ifeq "$(local_inotify_tools)" "true"
-vsys-
DEPEND
-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-
LOCAL-STOCK
-DEVEL-RPMS += inotify-tools inotify-tools-devel
endif
IN_NODEIMAGE += vsys
ALL += vsys
endif
IN_NODEIMAGE += vsys
ALL += vsys
@@
-322,13
+322,21
@@
autoconf-BUILD-FROM-SRPM := yes
ALL += autoconf
endif
ALL += autoconf
endif
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
#
# sliver-openvswitch
#
sliver-openvswitch-MODULES := sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
ifeq "$(DISTRONAME)" "f12"
#
# sliver-openvswitch
#
sliver-openvswitch-MODULES := sliver-openvswitch
sliver-openvswitch-SPEC := sliver-openvswitch.spec
ifeq "$(DISTRONAME)" "f12"
-sliver-openvswitch-
DEPEND-DEVEL-RPMS-UPDATES
:= autoconf
+sliver-openvswitch-
LOCAL-STOCK-DEVEL-RPMS-CRUCIAL
:= autoconf
endif
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
endif
IN_SLICEIMAGE += sliver-openvswitch
ALL += sliver-openvswitch
@@
-378,7
+386,7
@@
ALL += pcucontrol
#
monitor-MODULES := monitor
monitor-SPEC := Monitor.spec
#
monitor-MODULES := monitor
monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+monitor-
STOCK-
DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
IN_NODEIMAGE += monitor
ALL += monitor
IN_NODEIMAGE += monitor
@@
-447,14
+455,14
@@
IN_BOOTCD += pyplnet
#
rvm-ruby-MODULES := rvm-ruby
rvm-ruby-SPEC := rpm/rvm-ruby.spec
#
rvm-ruby-MODULES := rvm-ruby
rvm-ruby-SPEC := rpm/rvm-ruby.spec
-rvm-ruby-
DEVEL-RPMS := chrpath libyaml-devel libffi
-devel
+rvm-ruby-
STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt
-devel
ALL += rvm-ruby
#
# OML measurement library
#
oml-MODULES := oml
ALL += rvm-ruby
#
# OML measurement library
#
oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel
+oml-
STOCK-
DEVEL-RPMS += sqlite-devel
oml-SPEC := liboml.spec
ALL += oml
oml-SPEC := liboml.spec
ALL += oml
@@
-584,6
+592,7
@@
endif
# don't build these by default, we have separate builds for that
myslice-MODULES := myslice
myslice-SPEC := myslice.spec
# don't build these by default, we have separate builds for that
myslice-MODULES := myslice
myslice-SPEC := myslice.spec
+myslice-STOCK-DEVEL-RPMS := python-django
#ALL += myslice
manifold-MODULES := manifold
#ALL += myslice
manifold-MODULES := manifold