remove unusued madwifi and introduce func and certmaster

diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk
index 680cad3..4423548 100644 (file)
--- a/coblitz-latest-tags.mk
+++ b/coblitz-latest-tags.mk
@@ -3,7 +3,6 @@
 mkinitrd-GITPATH               := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-3
 linux-2.6-BRANCH                := rhel6
 linux-2.6-GITPATH               := git://git.verivue.com/planetlab/linux-2.6.git@linux-2.6-32-16
-madwifi-GITPATH                 := git://git.verivue.com/planetlab/madwifi.git@madwifi-4132-2
 util-vserver-GITPATH            := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-15
 util-vserver-BUILD-FROM-SRPM   := yes     # tmp
 util-vserver-pl-GITPATH         := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-25
@@ -40,6 +39,8 @@ yum-GITPATH                   := git://git.verivue.com/planetlab/yum.git@centos5
 endif
 ifeq "$(DISTRONAME)" "sl6"
 yum-GITPATH                    := git://git.verivue.com/planetlab/yum.git@rhel6
+certmaster-GITPAH              := git://git.verivue.com/caglar10ur/certmaster.git
+func-GITPAH                    := git://git.verivue.com/caglar10ur/func.git
 endif
 
 # locating the right test directory - see make tests_gitpath

diff --git a/coblitz.mk b/coblitz.mk
index 1c92c78..5c567bb 100644 (file)
--- a/coblitz.mk
+++ b/coblitz.mk
@@ -11,7 +11,31 @@
 #
 # see doc in Makefile  
 #
+#
+# certmaster & func
+# 
+ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
+ifeq "$(DISTRONAME)" "sl6"
+
+certmaster-MODULES := certmaster
+certmaster-SPEC := certmaster.spec
+certmaster-BUILD-FROM-SRPM := yes
+ALL += certmaster
+IN_BOOTSTRAPFS += certmaster
+IN_MYPLC += certmaster
+
+#func
+func-MODULES := func
+func-SPEC := func.spec
+func-BUILD-FROM-SRPM := yes
+ALL += func
+IN_BOOTSTRAPFS += func
+IN_MYPLC += func
+
+endif
+endif
 
+#
 # mkinitrd
 #
 ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk"
@@ -55,19 +79,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
 #