X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=coblitz.mk;h=bf6e57b02e0500531d5076fdc0b7098cc1cfea1b;hb=a8708104a13b1847430b6c6d8e1a10d7a6b66fb3;hp=9a70efcb34dd53986bc6238ff29561e8af3177db;hpb=ac7523bf5527a69b291d015b4910fa3d771ea058;p=build.git

diff --git a/coblitz.mk b/coblitz.mk
index 9a70efcb..bf6e57b0 100644
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -11,7 +11,29 @@
 #
 # 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 "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
@@ -55,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
 #
@@ -252,7 +261,7 @@ ALL += pcucontrol
 
 ## monitor
 #
-#monitor-MODULES := Monitor
+monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
 monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
@@ -267,6 +276,13 @@ 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
 
 #
 # nodeconfig
@@ -375,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