cleaning up ulogd, proper, and libhttpd++

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 52f8a28..ebe4088 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -17,7 +17,7 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-patches
+kernel-MODULES := linux-2.6
 kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
@@ -41,8 +41,7 @@ IN_MYPLC += $(KERNELS)
 #
 # kexec-tools
 #
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "4"
+ifeq "$(DISTRONAME)" "fc4"
 kexec-tools-MODULES := kexec-tools
 kexec-tools-SPEC := kexec-tools.spec
 kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
@@ -50,7 +49,6 @@ kexec-tools-TAG := planetlab-4_1-rc2
 ALL += kexec-tools
 IN_BOOTCD += kexec-tools
 endif
-endif
 
 #
 # madwifi
@@ -135,26 +133,6 @@ pl_sshd-SPEC := pl_sshd.spec
 ALL += pl_sshd
 IN_BOOTSTRAPFS += pl_sshd
 
-#
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
-#
-libhttpd-MODULES := libhttpd++
-libhttpd-SPEC := libhttpd++.spec
-ALL += libhttpd
-IN_BOOTSTRAPFS += libhttpd
-
-#
-# proper: Privileged Operations Service
-#
-proper-MODULES := proper
-proper-SPEC := proper.spec
-proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
-ALL += proper
-IN_BOOTSTRAPFS += proper
-
 #
 # codemux: Port 80 demux
 #
@@ -164,15 +142,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
 IN_BOOTSTRAPFS += codemux
 
-#
-# ulogd
-#
-ulogd-MODULES := ulogd
-ulogd-SPEC := ulogd.spec
-ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
-ALL += ulogd
-IN_VSERVER += ulogd
-
 #
 # fprobe-ulog
 #
@@ -181,6 +150,14 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+#
+# pf2slice
+#
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
+
+
 #
 # netflow
 #
@@ -217,17 +194,24 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
+endif
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
+endif
+# cannot find the required packages (see devel.pkgs) on centos5
+ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
 ALL += vsys
 endif
-ifeq "$(RELEASE)" "8"
-ALL += vsys
-endif
-endif
 
 #
 # PLCAPI
@@ -245,6 +229,14 @@ PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
 
+#
+# monitor
+#
+Monitor-MODULES := Monitor
+Monitor-SPEC := Monitor.spec
+ALL += Monitor
+IN_BOOTSTRAPFS += Monitor
+
 #
 # nodeconfig
 #
@@ -278,6 +270,7 @@ bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
 # package has *some* dependencies, at least these ones
 bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
 bootcd-DEPEND-FILES := RPMS/yumgroups.xml
+bootcd-RPMDATE := yes
 ALL += bootcd
 IN_MYPLC += bootcd
 
@@ -292,6 +285,7 @@ vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 # always redo all sequentially - try to keep updated
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
+vserver-RPMDATE := yes
 ALL += vserver
 IN_BOOTSTRAPFS += vserver
 
@@ -304,9 +298,31 @@ bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
 # package requires all regular packages
 bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
 bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
+bootstrapfs-RPMDATE := yes
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
+#
+# noderepo
+#
+# all rpms resulting from packages marked as being in bootstrapfs and vserver
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+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
+#export rpm list to the specfile
+noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+noderepo-RPMDATE := yes
+ALL += noderepo
+IN_MYPLC += noderepo
+
 #
 # myplc : initial, chroot-based packaging
 #
@@ -317,6 +333,7 @@ myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 # myplc may require all packages
 myplc-DEPEND-PACKAGES := $(IN_MYPLC)
 myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
+myplc-RPMDATE := yes
 ALL += myplc
 
 #