From 1a07d3366381117fc132cfac62dcee9779f91b95 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 22 Mar 2007 21:01:35 +0000 Subject: [PATCH] uses the branch rather than rc2 --- onelab-tags-rc2.mk | 57 +++++++++++++++++++++++++++++++++++++++++ onelab-tags.mk | 64 +++++++++++++++++++++++----------------------- 2 files changed, 89 insertions(+), 32 deletions(-) create mode 100644 onelab-tags-rc2.mk diff --git a/onelab-tags-rc2.mk b/onelab-tags-rc2.mk new file mode 100644 index 00000000..2498e114 --- /dev/null +++ b/onelab-tags-rc2.mk @@ -0,0 +1,57 @@ +# 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 + +CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs + +# this one is special : the boot script (in our case nightly-build.sh) extracts +# build from the trunk/HEAD. Then the various modules may need to extract build again, +# typically when then use mkfedora, and for that purpose they use the following tag. +build-TAG := planetlab-4_0-rc2 + +# the build's logic is sometimes confusing. Whether a package mentions a single or multiple modules, +# the variable used is different. +# Look for xxx-ambiguous-xxx below +# We define both just in case (as of now only the first one is used) + +# xxx-ambiguous-xxx +linux-2.6-TAG := planetlab-4_0-rc2 +kernel-i686-TAG := planetlab-4_0-rc2 +# we dont use this yet +kernel-x86_64-TAG := planetlab-4_0-rc2 +kernel-i586-TAG := planetlab-4_0-rc2 +# end +vnet-TAG := planetlab-4_0-rc2 +madwifi-ng-TAG := planetlab-4_0-rc2 +wireless-tools-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/wireless-tools/tags/29pre14 +ivtv-TAG := planetlab-4_0-rc2 +util-vserver-TAG := planetlab-4_0-rc2 +PlanetLabAccounts-TAG := planetlab-4_0-rc2 +NodeUpdate-TAG := planetlab-4_0-rc2 +PlanetLabConf-TAG := planetlab-4_0-rc2 +ipod-TAG := planetlab-4_0-rc2 +sudo-TAG := planetlab-4_0-rc2 +pycurl-TAG := planetlab-4_0-rc2 +BootServerRequest-TAG := planetlab-4_0-rc2 +PlanetLabID-TAG := planetlab-4_0-rc2 +NodeManager-TAG := planetlab-4_0-rc2 +pl_sshd-TAG := planetlab-4_0-rc2 +libhttpd++-TAG := planetlab-4_0-rc2 +proper-TAG := planetlab-4_0-rc2 +mysql-TAG := planetlab-4_0-rc2 +ulogd-TAG := planetlab-4_0-rc2 +netflow-TAG := planetlab-4_0-rc2 +pl_mom-TAG := planetlab-4_0-rc2 +iptables-TAG := planetlab-4_0-rc2 +iproute2-TAG := planetlab-4_0-rc2 +kexec-tools-TAG := planetlab-4_0-rc2 +util-python-TAG := planetlab-4_0-rc2 +# xxx-ambiguous-xxx +PLCAPI-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk +new_plc_api-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk +# end +vserver-reference-TAG := planetlab-4_0-rc2 +bootmanager-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/bootmanager/trunk +bootcd-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/bootcd/trunk +myplc-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/myplc/trunk +new_plc_www-TAG := planetlab-4_0-rc2 +plc/scripts-TAG := planetlab-4_0-rc2 diff --git a/onelab-tags.mk b/onelab-tags.mk index 2498e114..ea8c9b86 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -6,7 +6,7 @@ CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs # this one is special : the boot script (in our case nightly-build.sh) extracts # build from the trunk/HEAD. Then the various modules may need to extract build again, # typically when then use mkfedora, and for that purpose they use the following tag. -build-TAG := planetlab-4_0-rc2 +build-TAG := planetlab-4_0-branch # the build's logic is sometimes confusing. Whether a package mentions a single or multiple modules, # the variable used is different. @@ -14,44 +14,44 @@ build-TAG := planetlab-4_0-rc2 # We define both just in case (as of now only the first one is used) # xxx-ambiguous-xxx -linux-2.6-TAG := planetlab-4_0-rc2 -kernel-i686-TAG := planetlab-4_0-rc2 +linux-2.6-TAG := planetlab-4_0-branch +kernel-i686-TAG := planetlab-4_0-branch # we dont use this yet -kernel-x86_64-TAG := planetlab-4_0-rc2 -kernel-i586-TAG := planetlab-4_0-rc2 +kernel-x86_64-TAG := planetlab-4_0-branch +kernel-i586-TAG := planetlab-4_0-branch # end -vnet-TAG := planetlab-4_0-rc2 -madwifi-ng-TAG := planetlab-4_0-rc2 +vnet-TAG := planetlab-4_0-branch +madwifi-ng-TAG := planetlab-4_0-branch wireless-tools-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/wireless-tools/tags/29pre14 -ivtv-TAG := planetlab-4_0-rc2 -util-vserver-TAG := planetlab-4_0-rc2 -PlanetLabAccounts-TAG := planetlab-4_0-rc2 -NodeUpdate-TAG := planetlab-4_0-rc2 -PlanetLabConf-TAG := planetlab-4_0-rc2 -ipod-TAG := planetlab-4_0-rc2 -sudo-TAG := planetlab-4_0-rc2 -pycurl-TAG := planetlab-4_0-rc2 -BootServerRequest-TAG := planetlab-4_0-rc2 -PlanetLabID-TAG := planetlab-4_0-rc2 -NodeManager-TAG := planetlab-4_0-rc2 -pl_sshd-TAG := planetlab-4_0-rc2 -libhttpd++-TAG := planetlab-4_0-rc2 -proper-TAG := planetlab-4_0-rc2 -mysql-TAG := planetlab-4_0-rc2 -ulogd-TAG := planetlab-4_0-rc2 -netflow-TAG := planetlab-4_0-rc2 -pl_mom-TAG := planetlab-4_0-rc2 -iptables-TAG := planetlab-4_0-rc2 -iproute2-TAG := planetlab-4_0-rc2 -kexec-tools-TAG := planetlab-4_0-rc2 -util-python-TAG := planetlab-4_0-rc2 +ivtv-TAG := planetlab-4_0-branch +util-vserver-TAG := planetlab-4_0-branch +PlanetLabAccounts-TAG := planetlab-4_0-branch +NodeUpdate-TAG := planetlab-4_0-branch +PlanetLabConf-TAG := planetlab-4_0-branch +ipod-TAG := planetlab-4_0-branch +sudo-TAG := planetlab-4_0-branch +pycurl-TAG := planetlab-4_0-branch +BootServerRequest-TAG := planetlab-4_0-branch +PlanetLabID-TAG := planetlab-4_0-branch +NodeManager-TAG := planetlab-4_0-branch +pl_sshd-TAG := planetlab-4_0-branch +libhttpd++-TAG := planetlab-4_0-branch +proper-TAG := planetlab-4_0-branch +mysql-TAG := planetlab-4_0-branch +ulogd-TAG := planetlab-4_0-branch +netflow-TAG := planetlab-4_0-branch +pl_mom-TAG := planetlab-4_0-branch +iptables-TAG := planetlab-4_0-branch +iproute2-TAG := planetlab-4_0-branch +kexec-tools-TAG := planetlab-4_0-branch +util-python-TAG := planetlab-4_0-branch # xxx-ambiguous-xxx PLCAPI-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk new_plc_api-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/new_plc_api/trunk # end -vserver-reference-TAG := planetlab-4_0-rc2 +vserver-reference-TAG := planetlab-4_0-branch bootmanager-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/bootmanager/trunk bootcd-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/bootcd/trunk myplc-SVNPATH := svn+ssh://build@svn.one-lab.org/svn/myplc/trunk -new_plc_www-TAG := planetlab-4_0-rc2 -plc/scripts-TAG := planetlab-4_0-rc2 +new_plc_www-TAG := planetlab-4_0-branch +plc/scripts-TAG := planetlab-4_0-branch -- 2.43.0