From: Thierry Parmentelat Date: Fri, 16 Mar 2007 19:08:13 +0000 (+0000) Subject: extracts tag definition X-Git-Tag: 4.2-rc2~632 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cd8785a1592c68f471313dd7f2ad4d0dbf8f5ac0;p=build.git extracts tag definition --- diff --git a/onelab-tags.mk b/onelab-tags.mk new file mode 100644 index 00000000..17bcb369 --- /dev/null +++ b/onelab-tags.mk @@ -0,0 +1,40 @@ +> # we do not use TAG directly anymore +> # this because we want the rpm's releases to reflect the date even when a tag is used +> # our build script defines $(COMMON_TAG) that the various components are free to use or not +> +# $(COMMON_TAG) set from the build script + +build-tag := $(COMMON_TAG) +linux-2.6-TAG := $(COMMON_TAG) +vnet-TAG := $(COMMON_TAG) +madwifi-ng-TAG := $(COMMON_TAG) +wireless-tools-TAG := 29pre14 +ivtv-TAG := $(COMMON_TAG) +util-vserver-TAG := $(COMMON_TAG) +PlanetLabAccounts-TAG := $(COMMON_TAG) +NodeUpdate-TAG := $(COMMON_TAG) +PlanetLabConf-TAG := $(COMMON_TAG) +ipod-TAG := $(COMMON_TAG) +sudo-TAG := $(COMMON_TAG) +pycurl-TAG := $(COMMON_TAG) +BootServerRequest-TAG := $(COMMON_TAG) +PlanetLabID-TAG := $(COMMON_TAG) +NodeManager-TAG := $(COMMON_TAG) +pl_sshd-TAG := $(COMMON_TAG) +libhttpd++-TAG := $(COMMON_TAG) +proper-TAG := $(COMMON_TAG) +mysql-TAG := $(COMMON_TAG) +ulogd-TAG := $(COMMON_TAG) +netflow-TAG := $(COMMON_TAG) +pl_mom-TAG := $(COMMON_TAG) +iptables-TAG := $(COMMON_TAG) +iproute2-TAG := $(COMMON_TAG) +kexec-tools-TAG := $(COMMON_TAG) +util-python-TAG := $(COMMON_TAG) +new_plc_api-TAG := trunk +vserver-reference-TAG := $(COMMON_TAG) +bootmanager-TAG := trunk +bootcd-TAG := trunk +myplc-TAG := $(COMMON_TAG) +new_plc_www-TAG := $(COMMON_TAG) +plc/scripts-TAG := $(COMMON_TAG) diff --git a/onelab.mk b/onelab.mk index fbcc7307..da2bb020 100644 --- a/onelab.mk +++ b/onelab.mk @@ -4,7 +4,7 @@ # Mark Huang # Copyright (C) 2003-2006 The Trustees of Princeton University # -# $Id: onelab.mk,v 1.15 2007/03/16 14:59:47 thierry Exp $ +# $Id: onelab.mk,v 1.16 2007/03/16 16:07:57 thierry Exp $ # # @@ -24,6 +24,15 @@ # Add to ALL if you want the package built as part of the default set. # +#### +# we do not use TAG directly anymore, and let it to HEAD +# this because we want the rpm's releases to reflect the date even when a tag is used +# our build script defines COMMON_TAG that the various components are free to use or not + +# COMMON_TAG set from the build script + +include onelab-tags.mk + # # Default values #