By default, the naming convention for built RPMS is

<name>-<version>-<release>.planetlab.<arch>.rpm
Set PLDISTRO on the command line to differentiate between downstream
variants.

diff --git a/Makefile b/Makefile
index 29a907c..8df5849 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id: Makefile,v 1.79 2005/09/04 17:37:36 mlhuang Exp $
+# $Id: Makefile,v 1.80 2005/11/21 22:37:15 mlhuang Exp $
 #
 
 # Default target
@@ -35,6 +35,12 @@ INITIAL := HEAD
 TAG := HEAD
 CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
 
+# By default, the naming convention for built RPMS is
+# <name>-<version>-<release>.planetlab.<arch>.rpm
+# Set PLDISTRO on the command line to differentiate between downstream
+# variants.
+PLDISTRO := planetlab
+
 #
 # kernel
 #

diff --git a/Makerules b/Makerules
index ffee024..99177ac 100644 (file)
--- a/Makerules
+++ b/Makerules
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id$
+# $Id: Makerules,v 1.16 2005/09/01 18:58:45 mlhuang Exp $
 #
 
 # Base cvsps and rpmbuild in the current directory
@@ -126,6 +126,7 @@ ifeq ($(TAG),HEAD)
         # Define date for untagged builds
        echo "%define date $(DATE)" >> $@
 endif
+       echo "%define pldistro $(PLDISTRO)" >> $@
         # Rewrite patch sections of spec file
        perl -n -e ' \
        next if /^Patch.*/; \
@@ -139,6 +140,7 @@ endif
 # Build
 #
 
+RPMFLAGS += --define "pldistro $(PLDISTRO)"
 ifeq ($(TAG),HEAD)
 RPMFLAGS += --define "date $(DATE)"
 endif

diff --git a/Rules.mk b/Rules.mk
index ffee024..99177ac 100644 (file)
--- a/Rules.mk
+++ b/Rules.mk
@@ -4,7 +4,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2005 The Trustees of Princeton University
 #
-# $Id$
+# $Id: Makerules,v 1.16 2005/09/01 18:58:45 mlhuang Exp $
 #
 
 # Base cvsps and rpmbuild in the current directory
@@ -126,6 +126,7 @@ ifeq ($(TAG),HEAD)
         # Define date for untagged builds
        echo "%define date $(DATE)" >> $@
 endif
+       echo "%define pldistro $(PLDISTRO)" >> $@
         # Rewrite patch sections of spec file
        perl -n -e ' \
        next if /^Patch.*/; \
@@ -139,6 +140,7 @@ endif
 # Build
 #
 
+RPMFLAGS += --define "pldistro $(PLDISTRO)"
 ifeq ($(TAG),HEAD)
 RPMFLAGS += --define "date $(DATE)"
 endif