X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=6746aeaf4abccbe6bb9e13aca347d9cce65495c8;hb=efa76a7c40a8f252eeed975b7ab97a62f3ff3096;hp=326883dba2df7ec8d472dc99132d7553b4f5efd1;hpb=078eba962ae4b758fd372dd679205630365a2318;p=build.git

diff --git a/Makefile b/Makefile
index 326883db..6746aeaf 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-# $Id: Makefile,v 1.16 2004/04/12 15:30:14 mlh-pl_rpm Exp $
+# $Id: Makefile,v 1.32 2004/05/19 12:35:11 alk-pl_rpm Exp $
 #
 
 # Default target
@@ -45,6 +45,7 @@ all:
 # MODULE: CVS module name to use
 # SPEC: RPM spec file template
 # RPMFLAGS: Miscellaneous RPM flags
+# CVS_RSH: If not ssh
 # ALL: default targets
 #
 # If INITIAL is different than TAG, PatchSets will be generated
@@ -57,15 +58,15 @@ all:
 #
 
 #
-# kernel-planetlab
+# kernel
 #
 
-kernel-planetlab-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
-kernel-planetlab-INITIAL := linux-2_4_22
-kernel-planetlab-TAG := HEAD
-kernel-planetlab-MODULE := linux-2.4
-kernel-planetlab-SPEC := linux-2.4/scripts/kernel-planetlab.spec
-ALL += kernel-planetlab
+kernel-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+kernel-INITIAL := linux-2_4_22
+kernel-TAG := HEAD
+kernel-MODULE := linux-2.4
+kernel-SPEC := linux-2.4/scripts/kernel-planetlab.spec
+ALL += kernel
 
 #
 # plkmod
@@ -76,11 +77,11 @@ plkmod-INITIAL := HEAD
 plkmod-TAG := HEAD
 plkmod-MODULE := sys-v3
 plkmod-SPEC := sys-v3/rpm/plkmod.spec
-plkmod-RPMFLAGS = --define "kernelver $(shell rpmquery --queryformat '%{VERSION}-%{RELEASE}\n' --specfile SPECS/$(notdir $(kernel-planetlab-SPEC)) | head -1)"
+plkmod-RPMFLAGS = --define "kernelver $(shell rpmquery --queryformat '%{VERSION}-%{RELEASE}\n' --specfile SPECS/$(notdir $(kernel-SPEC)) | head -1)"
 ALL += plkmod
 
-# Build kernel-planetlab first so we can bootstrap off of its build
-plkmod: kernel-planetlab
+# Build kernel first so we can bootstrap off of its build
+plkmod: kernel
 
 #
 # vdk
@@ -91,11 +92,22 @@ vdk-INITIAL := vdk_918
 vdk-TAG := HEAD
 vdk-MODULE := vdk
 vdk-SPEC := vdk/vtune_driver.spec
-vdk-RPMFLAGS = --define "kernelver $(shell rpmquery --queryformat '%{VERSION}-%{RELEASE}\n' --specfile SPECS/$(notdir $(kernel-planetlab-SPEC)) | head -1)"
+vdk-RPMFLAGS = --define "kernelver $(shell rpmquery --queryformat '%{VERSION}-%{RELEASE}\n' --specfile SPECS/$(notdir $(kernel-SPEC)) | head -1)"
 ALL += vdk
 
-# Build kernel-planetlab first so we can bootstrap off of its build
-vdk: kernel-planetlab
+# Build kernel first so we can bootstrap off of its build
+vdk: kernel
+
+#
+# ltt
+#
+
+ltt-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+ltt-INITIAL := HEAD
+ltt-TAG := HEAD
+ltt-MODULE := ltt
+ltt-SPEC := ltt/ltt.spec
+ALL += ltt
 
 #
 # lkcdutils
@@ -108,8 +120,8 @@ lkcdutils-MODULE := lkcdutils
 lkcdutils-SPEC := lkcdutils/spec/lkcdutils.spec
 ALL += lkcdutils
 
-# Build kernel-planetlab first so we can bootstrap off of its build
-lkcdutils: kernel-planetlab
+# Build kernel first so we can bootstrap off of its build
+lkcdutils: kernel
 
 #
 # vserver
@@ -133,6 +145,39 @@ vserver-init-MODULE := vserver-init
 vserver-init-SPEC := vserver-init/vserver-init.spec
 ALL += vserver-init
 
+#
+# vserver-cache
+#
+
+vserver-cache-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+vserver-cache-INITIAL := HEAD
+vserver-cache-TAG := HEAD
+vserver-cache-MODULE := vserver-cache
+vserver-cache-SPEC := vserver-cache/vserver-cache.spec
+ALL += vserver-cache
+
+#
+# vserver-quota
+#
+
+vserver-quota-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+vserver-quota-INITIAL := HEAD
+vserver-quota-TAG := HEAD
+vserver-quota-MODULE := vserver-quota
+vserver-quota-SPEC := vserver-quota/vserver-quota.spec
+ALL += vserver-quota
+
+#
+# vserver-util
+#
+
+vserver-util-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+vserver-util-INITIAL := HEAD
+vserver-util-TAG := HEAD
+vserver-util-MODULE := vserver-util
+vserver-util-SPEC := vserver-util/vserver-util-planetlab.spec
+ALL += vserver-util
+
 #
 # vr-tools
 #
@@ -155,8 +200,41 @@ vsh-MODULE := vsh
 vsh-SPEC := vsh/vsh-planetlab.spec
 ALL += vsh
 
-# Build kernel-planetlab first so we can bootstrap off of its build
-vsh: kernel-planetlab
+# Build kernel first so we can bootstrap off of its build
+vsh: kernel
+
+#
+# e2fsprogs
+#
+
+e2fsprogs-CVSROOT := pup-pl_kernel@cvs.planet-lab.org:/cvs
+e2fsprogs-INITIAL := e2fsprogs-1_33
+e2fsprogs-TAG := HEAD
+e2fsprogs-MODULE := e2fsprogs
+e2fsprogs-SPEC := e2fsprogs/e2fsprogs.spec
+ALL += e2fsprogs
+
+#
+# initscripts
+#
+
+initscripts-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+initscripts-INITIAL := initscripts-7_14
+initscripts-TAG := HEAD
+initscripts-MODULE := initscripts
+initscripts-SPEC := initscripts/initscripts.spec
+ALL += initscripts
+
+#
+# cq-tools
+#
+
+cq-tools-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+cq-tools-INITIAL := HEAD
+cq-tools-TAG := HEAD
+cq-tools-MODULE := cq-tools
+cq-tools-SPEC := cq-tools/cq-tools.spec
+ALL += cq-tools
 
 #
 # yum
@@ -268,6 +346,94 @@ ipod-MODULE := ipod
 ipod-SPEC := ipod/ipod.spec
 ALL += ipod
 
+#
+# sudo
+#
+
+sudo-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+sudo-INITIAL := HEAD
+sudo-TAG := HEAD
+sudo-MODULE := sudo
+sudo-SPEC := sudo/planetlab_sudo.spec
+ALL += sudo
+
+#
+# blacklist
+#
+
+blacklist-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+blacklist-INITIAL := HEAD
+blacklist-TAG := HEAD
+blacklist-MODULE := blacklist
+blacklist-SPEC := blacklist/PlanetLab-blacklist.spec
+ALL += blacklist
+
+#
+# httpd
+#
+
+httpd-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+httpd-INITIAL := HEAD
+httpd-TAG := HEAD
+httpd-MODULE := httpd
+httpd-SPEC := httpd/httpd.spec
+ALL += httpd
+
+#
+# BootServerRequest
+#
+
+BootServerRequest-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+BootServerRequest-INITIAL := HEAD
+BootServerRequest-TAG := HEAD
+BootServerRequest-MODULE := BootServerRequest
+BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
+ALL += BootServerRequest
+
+#
+# PlanetLabID
+#
+
+PlanetLabID-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+PlanetLabID-INITIAL := HEAD
+PlanetLabID-TAG := HEAD
+PlanetLabID-MODULE := PlanetLabID
+PlanetLabID-SPEC := PlanetLabID/PlanetLabID.spec
+ALL += PlanetLabID
+
+#
+# iputils
+#
+
+iputils-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+iputils-INITIAL := HEAD
+iputils-TAG := HEAD
+iputils-MODULE := iputils
+iputils-SPEC := iputils/iputils.spec
+ALL += iputils
+
+#
+# traceroute
+#
+
+traceroute-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+traceroute-INITIAL := HEAD
+traceroute-TAG := HEAD
+traceroute-MODULE := traceroute
+traceroute-SPEC := traceroute/traceroute.spec
+ALL += traceroute
+
+#
+# net-tools
+#
+
+net-tools-CVSROOT := pup-node_pkgs@cvs.planet-lab.org:/cvs
+net-tools-INITIAL := net-tools-1_60
+net-tools-TAG := HEAD
+net-tools-MODULE := net-tools
+net-tools-SPEC := net-tools/RPM/net-tools.spec
+ALL += net-tools
+
 ifeq ($(findstring $(package),$(ALL)),)
 
 # Build all packages
@@ -277,7 +443,15 @@ all: $(ALL)
 $(ALL):
 	$(MAKE) package=$@
 
-.PHONY: all $(ALL)
+# Remove files generated by this package
+$(foreach package,$(ALL),$(package)-clean): %-clean:
+	$(MAKE) package=$* clean
+
+# Remove all generated files
+clean:
+	rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps
+
+.PHONY: all $(ALL) $(foreach package,$(ALL),$(package)-clean) clean
 
 else
 
@@ -293,9 +467,3 @@ CVS_RSH := $(if $($(package)-CVS_RSH),$($(package)-CVS_RSH),ssh)
 include Makerules
 
 endif
-
-# Remove generated files
-clean:
-	rm -rf BUILD RPMS SOURCES SPECS SRPMS .rpmmacros .cvsps
-
-.PHONY: clean