X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=bd1e4e5c4c6c4798cd1c759d4d6e1bbd81579738;hb=e01da7c87ad182016eefdb25e531f0799f95c7b5;hp=078a1a01b5e707eba54b657171a31f6e095d54aa;hpb=5e61c3a574de3ccc841045dfbe4d7a5bb5cbdb2b;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 078a1a01..bd1e4e5c 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
 #
-# $Id$
+# $Id: planetlab.mk,v 1.71 2007/09/25 18:38:47 faiyaza Exp $
 #
 
 #
@@ -29,6 +29,7 @@
 #
 
 CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+SVNROOT := http://svn.planet-lab.org/svn
 TAG := HEAD
 
 # Check if a tag has been checked out
@@ -49,53 +50,41 @@ endif
 # kernel
 #
 
-kernel-x86_64-MODULE := linux-2.6
-kernel-x86_64-RPMFLAGS:= --target x86_64
-kernel-x86_64-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-#ALL += kernel-x86_64
+# Figure out whether we are building on i386 or x86_64 host
+HOSTARCH := $(shell uname -i)
 
-kernel-i686-MODULE := linux-2.6
-kernel-i686-RPMFLAGS:= --target i686
-kernel-i686-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ALL += kernel-i686
-
-kernel-i586-MODULE := linux-2.6
-kernel-i586-RPMFLAGS:= --target i586
-kernel-i586-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
-ALL += kernel-i586
-
-kernel: kernel-i586 kernel-i686
-kernel-clean: kernel-i586-clean kernel-i686-clean
-
-#
-# vnet
-#
-
-vnet-MODULE := vnet
-vnet-SPEC := vnet/vnet.spec
-ALL += vnet
-
-# Build kernel first so we can bootstrap off of its build
-vnet: kernel
-
-#
-# madwifi
-#
+kernel-$(HOSTARCH)-MODULE := linux-2.6
+kernel-$(HOSTARCH)-SPEC := linux-2.6/scripts/kernel-2.6-planetlab.spec
+ifeq ($(HOSTARCH),i386)
+kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+else
+kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+endif
 
-madwifi-ng-MODULE := madwifi-ng
-madwifi-ng-SPEC := madwifi-ng/madwifi.spec
-ALL += madwifi-ng
+ALL += kernel-$(HOSTARCH)
 
-# Build kernel first so we can bootstrap off of its build
-madwifi-ng: kernel
+kernel-clean: kernel-$(HOSTARCH)-clean
+kernel: kernel-$(HOSTARCH)
 
-#
-# ivtv 
-#
 
-#ivtv-MODULE := ivtv
-#ivtv-SPEC := ivtv/ivtv.spec
-#ALL += ivtv
+###  Why are we building these??  -F
+### madwifi
+###
+##
+###madwifi-ng-MODULE := madwifi-ng
+###madwifi-ng-SPEC := madwifi-ng/madwifi.spec
+###ALL += madwifi-ng
+##
+### Build kernel first so we can bootstrap off of its build
+###madwifi-ng: kernel
+##
+###
+### ivtv 
+###
+##
+###ivtv-MODULE := ivtv
+###ivtv-SPEC := ivtv/ivtv.spec
+###ALL += ivtv
 
 #
 # util-vserver
@@ -106,22 +95,6 @@ util-vserver-SPEC := util-vserver/util-vserver.spec
 util-vserver-RPMFLAGS:= --without dietlibc
 ALL += util-vserver
 
-#
-# yum
-#
-
-yum-MODULE := yum
-yum-SPEC := yum/yum.spec
-ALL += yum
-
-#
-# PlanetLabAccounts
-#
-
-PlanetLabAccounts-MODULE := PlanetLabAccounts
-PlanetLabAccounts-SPEC := PlanetLabAccounts/PlanetLabAccounts.spec
-ALL += PlanetLabAccounts
-
 #
 # NodeUpdate
 #
@@ -131,53 +104,61 @@ NodeUpdate-SPEC := NodeUpdate/NodeUpdate.spec
 ALL += NodeUpdate
 
 #
-# PlanetLabConf
+# PlanetLabConf:  DEPRECATED.  
+#
+# conf_files does the same thing in NM
 #
 
-PlanetLabConf-MODULE := PlanetLabConf
-PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
-ALL += PlanetLabConf
+#PlanetLabConf-MODULE := PlanetLabConf
+#PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
+#ALL += PlanetLabConf
 
 #
 # ipod
 #
 
-ipod-MODULE := ipod
-ipod-SPEC := ipod/ipod.spec
-ALL += ipod
+PingOfDeath-MODULE := PingOfDeath
+PingOfDeath-SPEC := PingOfDeath/ipod.spec
+ALL += PingOfDeath
 
 #
-# sudo
+# sudo:  DEPRECATED
+#
+# Added functionality provided by this package to www/PlanetLabConf/sudoers.
 #
 
-sudo-MODULE := sudo
-sudo-SPEC := sudo/planetlab_sudo.spec
-ALL += sudo
+#sudo-MODULE := sudo
+#sudo-SPEC := sudo/planetlab_sudo.spec
+#ALL += sudo
 
 #
-# pycurl
+# pycurl:  DEPRECATE
+#
+# [tony] use FC6+ release
 #
 
-pycurl-MODULE := pycurl
-pycurl-SPEC := pycurl/pycurl.spec
-ALL += pycurl
+#curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
+#pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
+#pycurl_incompatnum := $(shell printf %d 0x071000) # 7.16.0
+#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
+#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_incompatnum) && echo 0),1)
+#pycurl-MODULE := pycurl
+#pycurl-SPEC := pycurl/pycurl.spec
+#ALL += pycurl
+#endif
+#endif
 
 #
-# BootServerRequest
+# BootServerRequest:  DEPRECATE
+#
+# Not used by anything.
 #
 
-BootServerRequest-MODULE := BootServerRequest
-BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
-ALL += BootServerRequest
-
+#BootServerRequest-MODULE := BootServerRequest
+#BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
+#ALL += BootServerRequest
 #
-# PlanetLabID
 #
-
-PlanetLabID-MODULE := PlanetLabID
-PlanetLabID-SPEC := PlanetLabID/PlanetLabID.spec
-ALL += PlanetLabID
-
 #
 # Node Manager
 #
@@ -197,6 +178,9 @@ ALL += pl_sshd
 #
 # libhttpd++: 
 #
+# Deprecate when vsys takes over [sapan].
+# keep in build for proper.
+#
 
 libhttpd++-MODULE := libhttpd++
 libhttpd++-SPEC := libhttpd++/libhttpd++.spec
@@ -208,17 +192,26 @@ ALL += libhttpd++
 
 proper-MODULE := proper
 proper-SPEC := proper/proper.spec
+proper-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += proper
 
 proper: libhttpd++
 
+#
+# CoDemux: Port 80 demux
+#
+
+codemux-MODULE := codemux
+codemux-SPEC   := codemux/codemux.spec
+#ALL += codemux
+
 #
 # MySQL
 #
 
 mysql-MODULE := mysql
 mysql-SPEC := mysql/mysql.spec
-ALL += mysql
+#ALL += mysql
 
 #
 # ulogd
@@ -228,25 +221,25 @@ ulogd-MODULE := ulogd
 ulogd-SPEC := ulogd/ulogd.spec
 ALL += ulogd
 
-ulogd: kernel proper mysql
+ulogd: kernel proper #mysql
 
 #
 # netflow
 #
 
-netflow-MODULE := netflow
-netflow-SPEC := netflow/netflow.spec
-ALL += netflow
+NetFlow-MODULE := NetFlow
+NetFlow-SPEC := NetFlow/netflow.spec
+ALL += NetFlow
 
-netflow: mysql
+netflow: #mysql
 
 #
 # PlanetLab Mom: Cleans up your mess
 #
 
-pl_mom-MODULE := pl_mom
-pl_mom-SPEC := pl_mom/pl_mom.spec
-ALL += pl_mom
+MoM-MODULE := MoM
+MoM-SPEC := MoM/pl_mom.spec
+ALL += MoM
 
 #
 # iptables
@@ -267,24 +260,24 @@ iproute-SPEC := iproute2/iproute.spec
 ALL += iproute
 
 #
-# kexec-tools
-#
-
-kexec-tools-MODULE := kexec-tools
-kexec-tools-SPEC := kexec-tools/kexec-tools.spec
-ALL += kexec-tools
-
+# kexec-tools:  DEPRECATE
 #
-# dhcp
+# [marc]    use FC6+ release
 #
 
-dhcp-MODULE := dhcp
-dhcp-SPEC := dhcp/dhcp.spec
-ALL += dhcp
+#kexec-tools-MODULE := kexec-tools
+#kexec-tools-SPEC := kexec-tools/kexec-tools.spec
+#ALL += kexec-tools
 
 #
 # util-python
 #
+# [marc]    deprecate server.py
+#
+# I dont know what the above means...  Daniel says we need to seperate util-vserver from
+# pl specific utilities (vuseradd, etc) which may or may not include vserver.py.  Until then,
+# I'm keeping this in the build.  -F
+#
 
 util-python-MODULE := util-python
 util-python-SPEC := util-python/util-python.spec
@@ -293,114 +286,145 @@ ALL += util-python
 # proper and util-vserver both use scripts in util-python for building
 proper: util-python
 util-vserver: util-python
-PlanetLabAuth: util-python
+#PlanetLabAuth: util-python
 
 #
-# PlanetLabAuth
+# vsys
 #
-
-PlanetLabAuth-MODULE := pl_auth
-PlanetLabAuth-SPEC := pl_auth/pl_auth.spec
-ALL += PlanetLabAuth
+vsys-MODULE := vsys
+vsys-SPEC := vsys/vsys.spec
+ALL += vsys
 
 #
-# plcapilib
+# PLCAPI
 #
 
-plcapilib-MODULE := plcmdline
-plcapilib-SPEC := plcmdline/plcapilib.spec
-ALL += plcapilib
+PLCAPI-MODULE := PLCAPI
+PLCAPI-SPEC := PLCAPI/PLCAPI.spec
+ALL += PLCAPI
 
 #
-# PLCAPI
+# PLCWWW
 #
 
-PLCAPI-MODULE := new_plc_api
-PLCAPI-SPEC := new_plc_api/PLCAPI.spec
-ALL += PLCAPI
+PLCWWW-MODULE := new_plc_www
+PLCWWW-SPEC := new_plc_www/PLCWWW.spec
+ALL += PLCWWW
 
 #
 # vserver-reference
 #
 
-vserver-reference-MODULE := vserver-reference build
-vserver-reference-SPEC := vserver-reference/vserver-reference.spec
+VserverReference-MODULE := VserverReference build
+VserverReference-SPEC := VserverReference/vserver-reference.spec
 # Package must be built as root
-vserver-reference-RPMBUILD := sudo rpmbuild
-ALL += vserver-reference
+VserverReference-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += VserverReference
 
 # vserver-reference may require current packages
 vserver-reference: $(filter-out vserver-reference,$(ALL))
 
 #
-# bootmanager
+# BootManager
 #
 
-bootmanager-MODULE := bootmanager build
-bootmanager-SPEC := bootmanager/bootmanager.spec
-bootmanager-RPMBUILD := sudo rpmbuild
-ALL += bootmanager
+BootManager-MODULE := BootManager build
+BootManager-SPEC := BootManager/BootManager.spec
+BootManager-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += BootManager
 
-# bootmanager requires current packages
-bootmanager: $(filter-out bootmanager,$(ALL))
+# BootManager requires current packages
+BootManager: $(filter-out BootManager,$(ALL))
 
 # ...and the yum manifest
-bootmanager: RPMS/yumgroups.xml
+BootManager: RPMS/yumgroups.xml
 
 #
-# bootcd
+# BootCD
 #
 
-bootcd-MODULE := bootcd build bootmanager
-bootcd-SPEC := bootcd/bootcd.spec
-bootcd-RPMBUILD := sudo rpmbuild
-ALL += bootcd
+BootCD-MODULE := BootCD build bootmanager
+BootCD-SPEC := BootCD/BootCD.spec
+BootCD-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += BootCD
 
-# bootcd requires current packages
-bootcd: $(filter-out bootcd,$(ALL))
+# BootCD requires current packages
+BootCD: $(filter-out BootCD,$(ALL))
 
 #
 # MyPLC
 #
 
-myplc-MODULE := $(sort $(foreach module,$(ALL),$($(module)-MODULE)) myplc new_plc_www plc/scripts)
-myplc-SPEC := myplc/myplc.spec
+MyPLC-MODULE := build MyPLC new_plc_www plc/scripts
+MyPLC-SPEC := MyPLC/myplc.spec
 # Package must be built as root
-myplc-RPMBUILD := sudo rpmbuild
-ALL += myplc
+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: RPMS/yumgroups.xml
 
 #
 # MyPLC development environment
 #
 
 myplc-devel-MODULE := build myplc
-myplc-devel-SPEC := myplc/myplc-devel.spec
+myplc-devel-SPEC := MyPLC/myplc-devel.spec
 # Package must be built as root
-myplc-devel-RPMBUILD := sudo rpmbuild
+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
+# Package must be built as root
+myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += myplc-native
+
+# MyPLC may require current packages
+myplc-native: $(filter-out MyPLC,$(ALL))
+
+# ...and the yum manifest
+myplc-native: RPMS/yumgroups.xml
+
+
+#
+# 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-MODULE := libnl
+libnl-SPEC := libnl/libnl.spec
+ALL += libnl
+
+util-vserver: libnl
+
 #
 # Installation rules
 # 
 
 # Upload packages to boot server
-SERVER := build@boot.planet-lab.org
-ARCHIVE := /var/www/html/install-rpms/archive
+SERVERA := build@boot1.planet-lab.org
+SERVERB := build@boot2.planet-lab.org
+ARCHIVE := /plc/data/var/www/html/install-rpms/archive
 
 # Put nightly alpha builds in a subdirectory
 ifeq ($(TAG),HEAD)
 ARCHIVE := $(ARCHIVE)/planetlab-alpha
-REPOS := /var/www/html/install-rpms/planetlab-alpha
+REPOS := /plc/data/var/www/html/install-rpms/planetlab-alpha
 endif
 
 RPMS/yumgroups.xml:
-	install -D -m 644 groups/v3_yumgroups.xml RPMS/yumgroups.xml
+	install -D -m 644 groups/v4_yumgroups.xml RPMS/yumgroups.xml
 
 install:
 ifeq ($(BASE),)
@@ -415,29 +439,37 @@ ifneq ($(wildcard /etc/planetlab/secring.gpg),)
 	--define "_signature gpg" \
 	--define "_gpg_path /etc/planetlab" \
 	--define "_gpg_name PlanetLab <info@planet-lab.org>" \
-	--resign RPMS/*/*.rpm SRPMS/*.rpm
+	--resign RPMS/*/*.rpm
 endif
 ifneq ($(BUILDS),)
         # Remove old runs
-	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVER) /bin/bash -s
+	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERA) /bin/bash -s
+	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERB) /bin/bash -s
 endif
         # Create package manifest
 	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/RPMS" RPMS > packages.xml
+        # Update yum metadata
+	yum-arch RPMS >/dev/null
+	createrepo -g yumgroups.xml RPMS >/dev/null
         # Populate repository
-	ssh $(SERVER) mkdir -p $(ARCHIVE)/$(BASE)/RPMS $(ARCHIVE)/$(BASE)/SRPMS
-	rsync --delete --links --perms --times --group --compress --rsh=ssh \
-	    $(sort $(subst -debuginfo,,$(wildcard RPMS/yumgroups.xml RPMS/*/*.rpm))) $(SERVER):$(ARCHIVE)/$(BASE)/RPMS/
-	ssh $(SERVER) yum-arch $(ARCHIVE)/$(BASE)/RPMS >/dev/null
-	ssh $(SERVER) createrepo -g yumgroups.xml $(ARCHIVE)/$(BASE)/RPMS >/dev/null
-	rsync --delete --links --perms --times --group --compress --rsh=ssh \
-	    $(wildcard SRPMS/*.rpm) $(SERVER):$(ARCHIVE)/$(BASE)/SRPMS/
-	ssh $(SERVER) yum-arch $(ARCHIVE)/$(BASE)/SRPMS >/dev/null
-	ssh $(SERVER) createrepo $(ARCHIVE)/$(BASE)/SRPMS >/dev/null
+	rsync \
+	--exclude '*-debuginfo-*' \
+	--recursive --links --perms --times --group --compress --rsh=ssh \
+	RPMS/ $(SERVERA):$(ARCHIVE)/$(BASE)
+	rsync \
+	--exclude '*-debuginfo-*' \
+	--recursive --links --perms --times --group --compress --rsh=ssh \
+	RPMS/ $(SERVERB):$(ARCHIVE)/$(BASE)
 ifeq ($(TAG),HEAD)
         # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-	if ! ssh $(SERVER) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-	    ssh $(SERVER) ln -nsf $(ARCHIVE)/$(BASE)/RPMS/ $(REPOS) ; \
+	if ! ssh $(SERVERA) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+	    ssh $(SERVERA) ln -nsf archive/$(BASE) $(REPOS) ; \
 	fi
+        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
+	if ! ssh $(SERVERB) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
+	    ssh $(SERVERB) ln -nsf archive/$(BASE) $(REPOS) ; \
+	fi
+
 endif
 endif