From: Zdeněk Šustr <sustr4@cesnet.cz>
Date: Wed, 25 Jul 2012 14:31:14 +0000 (+0000)
Subject: Even hackier hack for gridsite ;-)
X-Git-Tag: gridsite-core_R_1_7_22~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=8ed47bf2e4485285188c264b26f5ba94f537b386;p=jra1mw.git

Even hackier hack for gridsite ;-)
---

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 9d5b276..f2880c2 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -877,6 +877,17 @@ for my $ext (keys %deps_aux) {
 	'canl' => 'emi-',
 );
 
+%cvs_tag_suffix = (
+	'lb' => '',
+	'jp' => '',
+	'jobid' => '',
+	'lbjp-common' => '',
+	'gridsite' => '-core',
+	'px' => '',
+	'canl' => '',
+);
+
+
 # ==== projects specification ====
 # etics_name ........... ETICS project name
 # conf_prefix .......... ETICS configurations name prefix
@@ -896,6 +907,7 @@ for my $ext (keys %deps_aux) {
 		etics_name => 'org.glite',
 		conf_prefix => { %cvs_tag_prefix },
 		tag_prefix => { %cvs_tag_prefix },
+		tag_suffix => { %cvs_tag_suffix },
 		flavours => '--thrflavour=${globus.thr.flavor} --nothrflavour=${globus.nothr.flavor}',
 		local_prefix => '',
 		etics_externs => {
@@ -965,6 +977,7 @@ for my $ext (keys %deps_aux) {
 			'canl' => 'emi-',
 		},
 		tag_prefix => { %cvs_tag_prefix },
+		tag_suffix => { %cvs_tag_suffix },
 		flavours => '--thrflavour= --nothrflavour=',
 		local_prefix => '/usr',
 		etics_externs => {
@@ -1621,7 +1634,7 @@ sub mode_etics {
 	else {
 		$conf = "$confprefix$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 # XXX: gridsite hack
-		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}${subsys}_R_${major}_${minor}_${rev}" : 
+		$conftag = $subsys eq 'gridsite' ? "$project{tag_prefix}{$subsys}${subsys}$project{tag_suffix}{$subsys}_R_${major}_${minor}_${rev}" : 
 			"$project{tag_prefix}{$subsys}$subsys-${module}_R_${major}_${minor}_${rev}_${age}";
 
 		# lowering age for older packaging