X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=coblitz.mk;h=bf6e57b02e0500531d5076fdc0b7098cc1cfea1b;hb=f6fce464a4957f38caae331abba7079aeeac7bfe;hp=70c7440fcc175c6ae19d9bbe63a762e3abd9e013;hpb=dfc6bbe56a85fd9eed13ddccf2a661855ce33067;p=build.git

diff --git a/coblitz.mk b/coblitz.mk
index 70c7440f..bf6e57b0 100644
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -11,19 +11,43 @@
 #
 # see doc in Makefile  
 #
+#
+# certmaster & func
+# 
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
+ifeq "$(DISTRONAME)" "sl6"
+
+certmaster-MODULES := certmaster
+certmaster-SPEC := certmaster.spec
+ALL += certmaster
+IN_BOOTSTRAPFS += certmaster
+IN_MYPLC += certmaster
+
+#func
+func-MODULES := func
+func-SPEC := func.spec
+ALL += func
+IN_BOOTSTRAPFS += func
+IN_MYPLC += func
+
+endif
+endif
 
+#
 # mkinitrd
 #
-#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
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-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
@@ -34,9 +58,6 @@
 
 kernel-MODULES := linux-2.6
 kernel-SPEC := kernel-2.6.spec
-#ifeq "$(DISTRONAME)" "centos5"
-#kernel-DEPEND-DEVEL-RPMS: mkinitrd
-#endif
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
 kernel-RPMFLAGS:= --target i686
@@ -56,19 +77,6 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # turns out myplc installs kernel-vserver
 IN_MYPLC += $(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
-
 #
 # util-vserver
 #
@@ -118,14 +126,6 @@ nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
 IN_BOOTSTRAPFS += nodeupdate
 
-#
-# ipod
-#
-ipod-MODULES := PingOfDeath
-ipod-SPEC := ipod.spec
-ALL += ipod
-IN_BOOTSTRAPFS += ipod
-
 #
 # NodeManager
 #
@@ -134,20 +134,11 @@ 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
 #
 codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
-codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 #ALL += codemux
 #IN_BOOTSTRAPFS += codemux
 
@@ -202,6 +193,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
@@ -215,8 +210,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
@@ -254,14 +251,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
 #
@@ -269,28 +258,15 @@ pcucontrol-MODULES := pcucontrol
 pcucontrol-SPEC := pcucontrol.spec
 ALL += pcucontrol
 
+
+## monitor
 #
-# monitor
-#
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 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
@@ -300,13 +276,13 @@ pyopenssl-SPEC := pyOpenSSL.spec
 pyopenssl-BUILD-FROM-SRPM := yes
 ALL += pyopenssl
 
-
 #
-# sfa - Slice Facility Architecture
+# pyaspects
 #
-# sfa-MODULES := sfa
-# sfa-SPEC := sfa.spec
-# ALL += sfa
+pyaspects-MODULES := pyaspects
+pyaspects-SPEC := pyaspects.spec
+pyaspects-BUILD-FROM-SRPM := yes
+ALL += pyaspects
 
 #
 # nodeconfig
@@ -347,7 +323,6 @@ IN_BOOTCD += pyplnet
 #
 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
@@ -370,7 +345,6 @@ IN_BOOTSTRAPFS += vserver
 #
 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
@@ -388,7 +362,6 @@ 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-DEPEND-FILES := RPMS/yumgroups.xml
@@ -409,7 +382,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
 
@@ -418,3 +391,11 @@ release-MODULES := myplc
 release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
+
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
+# chroot supported yum
+yum-MODULES := yum
+yum-SPEC := yum.spec
+yum-BUILD-FROM-SRPM := yes
+ALL += yum
+endif