# 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"
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#
-# wireless-tools
-#
-wireless-tools-MODULES := wireless-tools
-wireless-tools-SPEC := wireless-tools.spec
-wireless-tools-BUILD-FROM-SRPM := yes
-ALL += wireless-tools
-IN_BOOTSTRAPFS += wireless-tools
-
-#
-# libnl
-#
-# [daniel] wait for latest Fedora release
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
-#
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
-
#
# util-vserver
#
#
util-vserver-pl-MODULES := util-vserver-pl
util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core
ALL += util-vserver-pl
IN_BOOTSTRAPFS += util-vserver-pl
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
#
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
#
pf2slice-SPEC := pf2slice.spec
ALL += pf2slice
-
-#
-# netflow
-#
-netflow-MODULES := PlanetFlow
-netflow-SPEC := netflow.spec
-ALL += netflow
-IN_BOOTSTRAPFS += netflow
-
#
# PlanetLab Mom: Cleans up your mess
#
iproute-SPEC := iproute.spec
ALL += iproute
IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
#
# vsys
ALL += PLCWWW
IN_MYPLC += PLCWWW
+#
+# monitor
+#
+Monitor-MODULES := Monitor
+Monitor-SPEC := Monitor.spec
+ALL += Monitor
+IN_BOOTSTRAPFS += Monitor
+
+#
+# monitor-server
+#
+monitor-server-MODULES := Monitor
+monitor-server-SPEC := monitor-server.spec
+ALL += monitor-server
+
#
# nodeconfig
#
# 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
# 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
# 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-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
-#
-myplc-MODULES := MyPLC build
-myplc-SPEC := myplc.spec
-# Package must be built as root
-myplc-RPMBUILD := sudo bash ./rpmbuild.sh
-# myplc may require all packages
-myplc-DEPEND-PACKAGES := $(IN_MYPLC)
-myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
-ALL += myplc
-
#
# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
#
myplc-native-DEPEND-FILES := myplc-release
ALL += myplc-native
+## #
+## # myplc : old-fashioned, chroot-based packaging
+## #
+## myplc-MODULES := MyPLC build
+## myplc-SPEC := myplc.spec
+## # Package must be built as root
+## 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
+
+# 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
+myplc-docs-SPEC := myplc-docs.spec
+ALL += myplc-docs