X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=fd6d6ea9ef61583f39dc7f27c33ff4b6e75c0a09;hb=4a3cdc6a05efb9fc405896faffe9b3805825ebc2;hp=35222ad1515bbecad2e3965dd4580d116e9283f0;hpb=76c7ef549a573c2a39800f2f1745f25f3dac94cc;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 35222ad1..fd6d6ea9 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 #
 # declare the packages to be built and their dependencies
 # initial version from Mark Huang
@@ -5,8 +7,6 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id$
-#
 # see doc in Makefile  
 #
 
@@ -37,26 +37,28 @@ ALL += $(KERNELS)
 IN_BOOTCD += $(KERNELS)
 IN_VSERVER += $(KERNELS)
 IN_BOOTSTRAPFS += $(KERNELS)
-# turns out myplc installs kernel-vserver
-IN_MYPLC += $(KERNELS)
 
 #
 # ipfw: root context module, and slice companion
 #
-ipfw-MODULES := ipfw
-ipfw-SPEC := ipfw.spec
-ipfw-DEPEND-DEVEL-RPMS := kernel-devel
-ipfw-SPECVARS = kernel_version=$(kernel.rpm-version) \
-	kernel_release=$(kernel.rpm-release) \
-	kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += ipfw
-ALL += ipfw
-
-ipfwslice-MODULES := ipfw
-ipfwslice-SPEC := ipfw-slice.spec
-IN_VSERVER += ipfwslice
+ipfwroot-MODULES := ipfwsrc
+ipfwroot-SPEC := planetlab/ipfwroot.spec
+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
+
+ipfwslice-MODULES := ipfwsrc
+ipfwslice-SPEC := planetlab/ipfwslice.spec
+ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
+        kernel_release=$(kernel.rpm-release) \
+        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
 #
@@ -69,6 +71,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
+#endif
 
 # 
 # nozomi
@@ -184,7 +187,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
 
@@ -271,16 +274,14 @@ ALL += vsys-scripts
 # 
 dummynet_image-MODULES := dummynet_image
 dummynet_image-SPEC := dummynet_image.spec
-IN_MYPLC += dummynet_image
 ALL += dummynet_image
 
 #
-# PLCAPI
+# plcapi
 #
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
+plcapi-MODULES := PLCAPI
+plcapi-SPEC := PLCAPI.spec
+ALL += plcapi
 
 #
 # drupal
@@ -289,7 +290,6 @@ drupal-MODULES := drupal
 drupal-SPEC := drupal.spec
 drupal-BUILD-FROM-SRPM := yes
 ALL += drupal
-IN_MYPLC += drupal
 
 #
 # use the plewww module instead
@@ -297,7 +297,6 @@ IN_MYPLC += drupal
 plewww-MODULES := PLEWWW
 plewww-SPEC := plewww.spec
 ALL += plewww
-IN_MYPLC += plewww
 
 #
 # www-register-wizard
@@ -305,7 +304,13 @@ IN_MYPLC += plewww
 www-register-wizard-MODULES := www-register-wizard
 www-register-wizard-SPEC := www-register-wizard.spec
 ALL += www-register-wizard
-IN_MYPLC += www-register-wizard
+
+#
+# pcucontrol
+#
+pcucontrol-MODULES := pcucontrol
+pcucontrol-SPEC := pcucontrol.spec
+ALL += pcucontrol
 
 #
 # monitor
@@ -340,7 +345,7 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
 sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
@@ -352,7 +357,6 @@ ALL += sfa
 nodeconfig-MODULES := nodeconfig build
 nodeconfig-SPEC := nodeconfig.spec
 ALL += nodeconfig
-IN_MYPLC += nodeconfig
 
 #
 # bootmanager
@@ -360,7 +364,6 @@ IN_MYPLC += nodeconfig
 bootmanager-MODULES := BootManager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
-IN_MYPLC += bootmanager
 
 #
 # pypcilib : used in bootcd
@@ -377,7 +380,6 @@ pyplnet-MODULES := pyplnet
 pyplnet-SPEC := pyplnet.spec
 ALL += pyplnet
 IN_BOOTSTRAPFS += pyplnet
-IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
@@ -385,12 +387,11 @@ 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
 ALL += bootcd
-IN_MYPLC += bootcd
 
 #
 # vserver : reference image for slices
@@ -408,12 +409,11 @@ 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
 ALL += bootstrapfs
-IN_MYPLC += bootstrapfs
 
 #
 # noderepo
@@ -426,7 +426,7 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
 noderepo-MODULES := BootstrapFS 
 noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
+noderepo-RPMBUILD := bash ./rpmbuild.sh
 # package requires all regular packages
 noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
@@ -434,12 +434,11 @@ noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
 noderepo-RPMDATE := yes
 ALL += noderepo
-IN_MYPLC += noderepo
 
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-MODULES := MyPLC build 
+myplc-MODULES := MyPLC build
 myplc-SPEC := myplc.spec
 myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
 ALL += myplc