X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=wextoolbox.mk;h=d686c1823377488e38ace72914e9d0034b862e98;hb=7f30eceaed727e2f3258bb53ec7e9158ded0048b;hp=443bd16697482064f063e755e3b05776f72265d7;hpb=2cd08878a4153a4da2c28640ebee128dd416ee82;p=wextoolbox.git

diff --git a/wextoolbox.mk b/wextoolbox.mk
index 443bd16..d686c18 100644
--- a/wextoolbox.mk
+++ b/wextoolbox.mk
@@ -5,8 +5,6 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id$
-#
 ### NOTES on diffs with onelab
 # 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore
 # does not include:
@@ -150,6 +148,7 @@ IN_BOOTSTRAPFS += madwifi
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes
 iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -242,7 +241,7 @@ IN_BOOTSTRAPFS += sshd
 #
 codemux-MODULES := CoDemux
 codemux-SPEC   := codemux.spec
-codemux-RPMBUILD := sudo bash ./rpmbuild.sh
+#codemux-RPMBUILD := bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
@@ -306,7 +305,7 @@ IN_BOOTSTRAPFS += vsys-scripts
 ALL += vsys-scripts
 
 #
-# PLCAPI
+# plcapi
 #
 plcapi-MODULES := PLCAPI
 plcapi-SPEC := PLCAPI.spec
@@ -353,13 +352,6 @@ monitor-SPEC := Monitor.spec
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-ALL += plcrt
-
 #
 # zabbix
 #
@@ -368,6 +360,13 @@ zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
 ALL += zabbix
 
+#
+# PLC RT
+#
+plcrt-MODULES := PLCRT
+plcrt-SPEC := plcrt.spec
+ALL += plcrt
+
 #
 # pyopenssl
 #
@@ -376,13 +375,26 @@ pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
+#
+# pyaspects
+#
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
 
+#
+# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__
+build_sfa=false
+
+ifeq "$(build_sfa)" "true"
 #
 # sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
+endif
 
 #
 # nodeconfig
@@ -423,7 +435,7 @@ IN_BOOTCD += pyplnet
 #
 bootcd-MODULES := BootCD build
 bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
+bootcd-RPMBUILD := bash ./rpmbuild.sh
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 bootcd-RPMDATE := yes
@@ -446,7 +458,7 @@ IN_BOOTSTRAPFS += vserver
 #
 bootstrapfs-MODULES := BootstrapFS build
 bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
+bootstrapfs-RPMBUILD := bash ./rpmbuild.sh
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 bootstrapfs-RPMDATE := yes
@@ -457,16 +469,16 @@ 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-SPEC := noderepo.spec
-noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-RPMBUILD := bash ./rpmbuild.sh
+# 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)