X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=coblitz.mk;h=cb2336ef3eb4aba360fe73eceec90e566861bf8f;hb=89882652bda7b49174d736ef16ed6f1488623d7b;hp=363b34c85a4ba531708b4cbdb7962836a1a26b70;hpb=1fde7b3fdf6420155e974449c0f2102fe4d6b5ec;p=build.git

diff --git a/coblitz.mk b/coblitz.mk
index 363b34c8..cb2336ef 100644
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 #
 # declare the packages to be built and their dependencies
 # initial version from Mark Huang
@@ -5,11 +7,26 @@
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
-# $Id: planetlab.mk 14230 2009-07-03 00:58:17Z thierry $
+# $Id$
 #
 # see doc in Makefile  
 #
 
+# mkinitrd
+#
+ifeq "$(PLDISTROTAGS)" "coblitz-unstable-tags.mk"
+ifeq "$(DISTRONAME)" "centos5"
+mkinitrd-MODULES := mkinitrd
+mkinitrd-SPEC := mkinitrd.spec
+mkinitrd-BUILD-FROM-SRPM := yes
+ALL += mkinitrd
+IN_BOOTCD += mkinitrd
+IN_VSERVER += mkinitrd
+IN_BOOTSTRAPFS += mkinitrd
+IN_MYPLC += mkinitrd
+endif
+endif
+
 #
 # kernel
 #
@@ -95,7 +112,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 #
 # NodeUpdate
 #
-nodeupdate-MODULES := NodeUpdate
+nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
@@ -111,7 +128,7 @@ IN_BOOTSTRAPFS += ipod
 #
 # NodeManager
 #
-nodemanager-MODULES := NodeManager
+nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
@@ -121,40 +138,39 @@ IN_BOOTSTRAPFS += nodemanager
 #
 sshd-MODULES := pl_sshd
 sshd-SPEC := pl_sshd.spec
-#ALL += sshd
-#IN_BOOTSTRAPFS += sshd
+ALL += sshd
+IN_BOOTSTRAPFS += sshd
 
 #
 # codemux: Port 80 demux
 #
-codemux-MODULES := CoDemux
+codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
-codemux-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += codemux
-IN_BOOTSTRAPFS += codemux
+#ALL += codemux
+#IN_BOOTSTRAPFS += codemux
 
 #
 # fprobe-ulog
 #
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_BOOTSTRAPFS += fprobe-ulog
+#ALL += fprobe-ulog
+#IN_BOOTSTRAPFS += fprobe-ulog
 
 #
 # pf2slice
 #
 pf2slice-MODULES := pf2slice
 pf2slice-SPEC := pf2slice.spec
-ALL += pf2slice
+#ALL += pf2slice
 
 #
 # PlanetLab Mom: Cleans up your mess
 #
 mom-MODULES := Mom
 mom-SPEC := pl_mom.spec
-ALL += mom
-IN_BOOTSTRAPFS += mom
+#ALL += mom
+#IN_BOOTSTRAPFS += mom
 
 #
 # iptables
@@ -214,7 +230,7 @@ ALL += vsys-scripts
 #
 # PLCAPI
 #
-PLCAPI-MODULES := PLCAPI
+PLCAPI-MODULES := plcapi
 PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
 IN_MYPLC += PLCAPI
@@ -231,10 +247,10 @@ IN_MYPLC += drupal
 #
 # use the plewww module instead
 #
-plewww-MODULES := PLEWWW
+plewww-MODULES := plewww
 plewww-SPEC := plewww.spec
-ALL += plewww
-IN_MYPLC += plewww
+#ALL += plewww
+#IN_MYPLC += plewww
 
 #
 # www-register-wizard
@@ -244,6 +260,13 @@ 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
 #
@@ -257,7 +280,7 @@ IN_BOOTSTRAPFS += monitor
 #
 plcrt-MODULES := PLCRT
 plcrt-SPEC := plcrt.spec
-ALL += plcrt
+#ALL += plcrt
 
 #
 # zabbix
@@ -265,7 +288,7 @@ ALL += plcrt
 zabbix-MODULES := Monitor
 zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
+#ALL += zabbix
 
 #
 # pyopenssl
@@ -277,11 +300,11 @@ ALL += pyopenssl
 
 
 #
-# sfa - Slice Facility Architecture - fka geniwrapper
+# sfa - Slice Facility Architecture
 #
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
+# sfa-MODULES := sfa
+# sfa-SPEC := sfa.spec
+# ALL += sfa
 
 #
 # nodeconfig
@@ -294,7 +317,7 @@ IN_MYPLC += nodeconfig
 #
 # bootmanager
 #
-bootmanager-MODULES := BootManager
+bootmanager-MODULES := bootmanager
 bootmanager-SPEC := bootmanager.spec
 ALL += bootmanager
 IN_MYPLC += bootmanager
@@ -320,9 +343,8 @@ IN_BOOTCD += pyplnet
 #
 # bootcd
 #
-bootcd-MODULES := BootCD build
+bootcd-MODULES := bootcd build
 bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
 bootcd-RPMDATE := yes
@@ -332,7 +354,7 @@ IN_MYPLC += bootcd
 #
 # vserver : reference image for slices
 #
-vserver-MODULES := VserverReference build
+vserver-MODULES := vserver-reference build
 vserver-SPEC := vserver-reference.spec
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
@@ -343,9 +365,8 @@ IN_BOOTSTRAPFS += vserver
 #
 # bootstrapfs
 #
-bootstrapfs-MODULES := BootstrapFS build
+bootstrapfs-MODULES := bootstrapfs build
 bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 bootstrapfs-RPMDATE := yes
@@ -361,9 +382,8 @@ NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).r
 SPACE=$(subst x, ,x)
 NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
-noderepo-MODULES := BootstrapFS 
+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-DEPEND-FILES := RPMS/yumgroups.xml
@@ -376,7 +396,7 @@ 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
@@ -384,12 +404,12 @@ 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 Monitor
+myplc-docs-MODULES := myplc plcapi nodemanager Monitor
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 
 # using some other name than myplc-release, as this is a make target already
-release-MODULES := MyPLC
+release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release