X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=38d33f8bb23f8e70c715ec5a30edd57a7ee63411;hb=8116d84063c0d3e88b76c4ffed0995878a1f2052;hp=e6e596099fc5bbcfd4f756a32b325f85d3d170e7;hpb=4d0b0c9f212cc3fe11bebccacaa53c8833b2b31e;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index e6e5960..38d33f8 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -121,48 +121,17 @@ IN_BOOTCD += $(KERNELS)
 IN_VSERVER += $(KERNELS)
 IN_BOOTSTRAPFS += $(KERNELS)
 
-#
-# madwifi
-#
-madwifi-MODULES := madwifi
-madwifi-SPEC := madwifi.spec
-madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS := kernel-devel
-madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-ALL += madwifi
-IN_BOOTSTRAPFS += madwifi
-
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
 #
 # ipfw: root context module, and slice companion
 #
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
+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
 ipfwslice-SPEC := planetlab/ipfwslice.spec
@@ -171,6 +140,39 @@ ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
+#
+# madwifi
+#
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+	kernel_release=$(kernel.rpm-release) \
+	kernel_arch=$(kernel.rpm-arch)
+ALL += madwifi
+IN_BOOTSTRAPFS += madwifi
+
+### # 
+### # nozomi
+### # 
+### nozomi-MODULES := nozomi
+### nozomi-SPEC := nozomi.spec
+### nozomi-DEPEND-DEVEL-RPMS += kernel-devel
+### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+### 	kernel_release=$(kernel.rpm-release) \
+### 	kernel_arch=$(kernel.rpm-arch)
+### IN_BOOTSTRAPFS += nozomi
+### ALL += nozomi
+
+### #
+### # comgt
+### # 
+### comgt-MODULES := comgt
+### comgt-SPEC := comgt.spec
+### IN_BOOTSTRAPFS += comgt
+### ALL += comgt
+
 #
 # umts: root context stuff
 #
@@ -187,6 +189,25 @@ umts-frontend-SPEC := frontend.spec
 IN_VSERVER += umts-frontend
 ALL += umts-frontend
 
+#
+# iptables
+#
+iptables-MODULES := iptables
+iptables-SPEC := iptables.spec
+iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+ALL += iptables
+IN_BOOTSTRAPFS += iptables
+
+#
+# iproute
+#
+iproute-MODULES := iproute2
+iproute-SPEC := iproute.spec
+ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
+
 #
 # util-vserver
 #
@@ -211,7 +232,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-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
 endif
@@ -221,7 +242,7 @@ endif
 #
 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-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
 util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
 endif
@@ -276,6 +297,15 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+### #
+### # DistributedRateLimiting
+### #
+### DistributedRateLimiting-MODULES := DistributedRateLimiting
+### DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+### ALL += DistributedRateLimiting
+### IN_NODEREPO += DistributedRateLimiting
+
+
 #
 # pf2slice
 #
@@ -308,14 +338,23 @@ IN_BOOTSTRAPFS += inotify-tools
 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-MODULES := vsys
 vsys-SPEC := vsys.spec
-vsys-DEVEL-RPMS += ocaml-docs ocaml-ocamldoc
+vsys-DEVEL-RPMS += ocaml-ocamldoc
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
@@ -329,7 +368,7 @@ IN_BOOTSTRAPFS += vsys-scripts
 ALL += vsys-scripts
 
 #
-# PLCAPI
+# plcapi
 #
 plcapi-MODULES := plcapi
 plcapi-SPEC := PLCAPI.spec
@@ -409,6 +448,38 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
+### #
+### # ejabberd
+### #
+### ejabberd-MODULES := ejabberd
+### ejabberd-SPEC := ejabberd.spec
+### ejabberd-BUILD-FROM-SRPM := yes
+### ejabberd-DEVEL-RPMS += erlang pam-devel hevea
+### # 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
+### endif
+
+### # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
+### build_sfa=true
+### ifeq "$(DISTRONAME)" "centos5"
+### build_sfa=false
+### endif
+
+### ifeq "$(build_sfa)" "true"
+### #
+### # sfa - Slice Facility Architecture
+### #
+### sfa-MODULES := sfa
+### sfa-SPEC := sfa.spec
+### ALL += sfa
+### endif
+
+### sface-MODULES := sface
+### sface-SPEC := sface.spec
+### ALL += sface
+
 #
 # nodeconfig
 #
@@ -443,6 +514,21 @@ IN_BOOTSTRAPFS += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
+### #
+### # OMF resource controller
+### #
+### omf-resctl-MODULES := omf
+### omf-resctl-SPEC := omf-resctl.spec
+### ALL += omf-resctl
+### IN_VSERVER += omf-resctl
+
+### #
+### # OMF exp controller
+### #
+### omf-expctl-MODULES := omf
+### omf-expctl-SPEC := omf-expctl.spec
+### ALL += omf-expctl
+
 #
 # bootcd
 #
@@ -480,15 +566,15 @@ IN_MYPLC += bootstrapfs
 # 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))
 
-noderepo-MODULES := bootstrapfs 
+noderepo-MODULES := bootstrapfs
 noderepo-SPEC := noderepo.spec
-# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+# package requires all embedded packages
+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)