X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=coblitz.mk;h=7979f91bba352b91cc968ad3bfcde65c080c1851;hb=07a5c4cf5cb4d4c0f92dc87c3c6b970b54cd7ace;hp=cb2336ef3eb4aba360fe73eceec90e566861bf8f;hpb=9c4736723ef4d1ef229f021306c4fcc059623a62;p=build.git

diff --git a/coblitz.mk b/coblitz.mk
index cb2336ef..7979f91b 100644
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -14,7 +14,7 @@
 
 # mkinitrd
 #
-ifeq "$(PLDISTROTAGS)" "coblitz-unstable-tags.mk"
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
 ifeq "$(DISTRONAME)" "centos5"
 mkinitrd-MODULES := mkinitrd
 mkinitrd-SPEC := mkinitrd.spec
@@ -117,14 +117,6 @@ nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
 
-#
-# ipod
-#
-ipod-MODULES := PingOfDeath
-ipod-SPEC := ipod.spec
-ALL += ipod
-IN_BOOTSTRAPFS += ipod
-
 #
 # NodeManager
 #
@@ -133,14 +125,6 @@ nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
 IN_BOOTSTRAPFS += nodemanager
 
-#
-# pl_sshd
-#
-sshd-MODULES := pl_sshd
-sshd-SPEC := pl_sshd.spec
-ALL += sshd
-IN_BOOTSTRAPFS += sshd
-
 #
 # codemux: Port 80 demux
 #
@@ -200,6 +184,10 @@ ifeq "$(DISTRONAME)" "centos5"
 local_inotify_tools=true
 endif
 
+ifeq "$(DISTRONAME)" "sl6"
+local_inotify_tools=true
+endif
+
 ifeq "$(local_inotify_tools)" "true"
 inotify-tools-MODULES := inotify-tools
 inotify-tools-SPEC := inotify-tools.spec
@@ -213,8 +201,10 @@ 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-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 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
@@ -252,14 +242,6 @@ plewww-SPEC := plewww.spec
 #ALL += plewww
 #IN_MYPLC += plewww
 
-#
-# www-register-wizard
-#
-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
 #
@@ -267,29 +249,6 @@ pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
 
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-#ALL += plcrt
-
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-#ALL += zabbix
-
 #
 # pyopenssl
 #
@@ -299,13 +258,6 @@ pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
 
-#
-# sfa - Slice Facility Architecture
-#
-# sfa-MODULES := sfa
-# sfa-SPEC := sfa.spec
-# ALL += sfa
-
 #
 # nodeconfig
 #
@@ -404,7 +356,7 @@ 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
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs