# Required:
#
# CVSROOT or package-CVSROOT: CVSROOT to use
-# TAG or package-TAG: CVS tag to use
-# package-MODULE: CVS module name to use
+# or
+# SVNPATH or package-SVNPATH: SVNPATH to use
+# Note: do not define both CVSROOT and SVNPATH
+#
+# TAG or package-TAG: CVS/SVN tag to use
+# package-MODULE: CVS/SVN module name to use
# package-SPEC: RPM spec file template
#
# Optional:
#
# package-RPMFLAGS: Miscellaneous RPM flags
# package-RPMBUILD: If not rpmbuild
-# package-CVS_RSH: If not ssh
+# package-CVS_RSH: If not ssh for cvs
#
# Add to ALL if you want the package built as part of the default set.
#
# Default values
#
-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-SVNROOT := http://svn.planet-lab.org/svn
-TAG := HEAD
+#CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+#TAG := HEAD
+
+SVNPATH := https://svn.planet-lab.org/svn
+TAG := trunk
# Check if a tag has been checked out
ifneq ($(wildcard CVS/Root),)
# Figure out whether we are building on i386 or x86_64 host
HOSTARCH := $(shell uname -i)
+kernel-$(HOSTARCH)-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+kernel-$(HOSTARCH)-TAG := HEAD
kernel-$(HOSTARCH)-MODULE := linux-2.6
-kernel-$(HOSTARCH)-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
+kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
ifeq ($(HOSTARCH),i386)
kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
else
#
util-vserver-MODULE := util-vserver
-util-vserver-SPEC := util-vserver/util-vserver.spec
+util-vserver-SPEC := util-vserver.spec
util-vserver-RPMFLAGS:= --without dietlibc
ALL += util-vserver
#
NodeUpdate-MODULE := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate/NodeUpdate.spec
+NodeUpdate-SPEC := NodeUpdate.spec
ALL += NodeUpdate
#
#
PingOfDeath-MODULE := PingOfDeath
-PingOfDeath-SPEC := PingOfDeath/ipod.spec
+PingOfDeath-SPEC := ipod.spec
ALL += PingOfDeath
#
#
NodeManager-MODULE := NodeManager
-NodeManager-SPEC := NodeManager/NodeManager.spec
+NodeManager-SPEC := NodeManager.spec
ALL += NodeManager
#
#
pl_sshd-MODULE := pl_sshd
-pl_sshd-SPEC := pl_sshd/pl_sshd.spec
+pl_sshd-SPEC := pl_sshd.spec
ALL += pl_sshd
#
#
libhttpd++-MODULE := libhttpd++
-libhttpd++-SPEC := libhttpd++/libhttpd++.spec
+libhttpd++-SPEC := libhttpd++.spec
ALL += libhttpd++
#
#
proper-MODULE := proper
-proper-SPEC := proper/proper.spec
+proper-SPEC := proper.spec
proper-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += proper
# CoDemux: Port 80 demux
#
-codemux-MODULE := codemux
-codemux-SPEC := codemux/codemux.spec
-#ALL += codemux
+CoDemux-MODULE := CoDemux
+CoDemux-SPEC := codemux.spec
+CoDemux-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += CoDemux
#
# MySQL
#
mysql-MODULE := mysql
-mysql-SPEC := mysql/mysql.spec
+mysql-SPEC := mysql.spec
#ALL += mysql
#
#
ulogd-MODULE := ulogd
-ulogd-SPEC := ulogd/ulogd.spec
+ulogd-SPEC := ulogd.spec
ALL += ulogd
ulogd: kernel proper #mysql
#
NetFlow-MODULE := NetFlow
-NetFlow-SPEC := NetFlow/netflow.spec
+NetFlow-SPEC := netflow.spec
ALL += NetFlow
netflow: #mysql
# PlanetLab Mom: Cleans up your mess
#
-MoM-MODULE := MoM
-MoM-SPEC := MoM/pl_mom.spec
-ALL += MoM
+Mom-MODULE := Mom
+Mom-SPEC := pl_mom.spec
+ALL += Mom
#
# iptables
#
iptables-MODULE := iptables
-iptables-SPEC := iptables/iptables.spec
+iptables-SPEC := iptables.spec
ALL += iptables
iptables: kernel
#
iproute-MODULE := iproute2
-iproute-SPEC := iproute2/iproute.spec
+iproute-SPEC := iproute.spec
ALL += iproute
#
#
util-python-MODULE := util-python
-util-python-SPEC := util-python/util-python.spec
+util-python-SPEC := util-python.spec
ALL += util-python
# proper and util-vserver both use scripts in util-python for building
+# [dhozac] Not anymore. util-vserver uses automake and no longer needs util-python
proper: util-python
-util-vserver: util-python
+
+#util-vserver: util-python
#PlanetLabAuth: util-python
+
+# vsys does not compile when ocaml rpm is installed. Need to fix include path
+# so that it compiles. Sapan will need to fix this.
#
# vsys
#
vsys-MODULE := vsys
-vsys-SPEC := vsys/vsys.spec
-ALL += vsys
+vsys-SPEC := vsys.spec
+# ALL += vsys
#
# PLCAPI
#
-PLCAPI-MODULE := new_plc_api
-PLCAPI-SPEC := new_plc_api/PLCAPI.spec
+PLCAPI-MODULE := PLCAPI
+PLCAPI-SPEC := PLCAPI.spec
ALL += PLCAPI
#
# PLCWWW
#
-PLCWWW-MODULE := new_plc_www
-PLCWWW-SPEC := new_plc_www/PLCWWW.spec
+PLCWWW-MODULE := WWW
+PLCWWW-SPEC := PLCWWW.spec
ALL += PLCWWW
#
#
VserverReference-MODULE := VserverReference build
-VserverReference-SPEC := VserverReference/vserver-reference.spec
+VserverReference-SPEC := vserver-reference.spec
# Package must be built as root
VserverReference-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += VserverReference
#
BootManager-MODULE := BootManager build
-BootManager-SPEC := BootManager/BootManager.spec
+BootManager-SPEC := BootManager.spec
BootManager-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += BootManager
# BootCD
#
-BootCD-MODULE := BootCD build bootmanager
-BootCD-SPEC := BootCD/BootCD.spec
+BootCD-MODULE := BootCD build BootManager
+BootCD-SPEC := bootcd.spec
BootCD-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += BootCD
# BootCD requires current packages
-BootCD: $(filter-out BootCD,$(ALL))
+# BootCD: $(filter-out BootCD,$(ALL))
#
# MyPLC
#
-MyPLC-MODULE := build MyPLC new_plc_www plc/scripts
-MyPLC-SPEC := MyPLC/myplc.spec
+MyPLC-MODULE := MyPLC build WWW
+MyPLC-SPEC := myplc.spec
# Package must be built as root
MyPLC-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += MyPLC
# MyPLC may require current packages
-MyPLC: $(filter-out MyPLC,$(ALL))
+#MyPLC: $(filter-out MyPLC,$(ALL))
# ...and the yum manifest
MyPLC: RPMS/yumgroups.xml
# MyPLC development environment
#
-myplc-devel-MODULE := build myplc
-myplc-devel-SPEC := MyPLC/myplc-devel.spec
+myplc-devel-MODULE := MyPLC build
+myplc-devel-SPEC := myplc-devel.spec
# Package must be built as root
myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += myplc-devel
# MyPLC native
#
-myplc-native-MODULE := build MyPLC plc/scripts
-myplc-native-SPEC := MyPLC/myplc-native.spec
+myplc-native-MODULE := MyPLC build
+myplc-native-SPEC := myplc-native.spec
# Package must be built as root
myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += myplc-native
myplc-native: RPMS/yumgroups.xml
+#
+# MyPLC native
+#
+
+myplc-devel-native-MODULE := MyPLC
+myplc-devel-native-SPEC := myplc-devel-native.spec
+ALL += myplc-devel-native
+
#
# libnl
#
#
libnl-MODULE := libnl
-libnl-SPEC := libnl/libnl.spec
+libnl-SPEC := libnl.spec
ALL += libnl
util-vserver: libnl