Merge pull request #41 from jouvin/cvmfs.yumonly

CVMFS: remove support for SPMA
quattor · Nov 10, 2014 · a955882 · a955882
2 parents b021fc0 + ffc7915
commit a955882
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 44 deletions.
diff --git a/features/cvmfs/client.pan b/features/cvmfs/client.pan
@@ -81,7 +81,7 @@ variable VO_CMS_LOCAL_SITE ?= undef;
 # Add RPMs
 #
 variable RPMS_CONFIG_SUFFIX ?= '';
-include {'features/cvmfs/rpms/client' + RPMS_CONFIG_SUFFIX};
+include { 'features/cvmfs/rpms' };
 
 
 #

diff --git a/features/cvmfs/rpms/client-yd.pan → features/cvmfs/rpms.pan b/features/cvmfs/rpms/client-yd.pan → features/cvmfs/rpms.pan
@@ -1,4 +1,4 @@
-unique template features/cvmfs/rpms/client-yd;
+unique template features/cvmfs/rpms;
 
 '/software/packages/{cvmfs}' ?= nlist();
 '/software/packages/{cvmfs-keys}' ?= nlist();
diff --git a/features/cvmfs/rpms/client-2.0.22-1.pan b/features/cvmfs/rpms/client-2.0.22-1.pan
diff --git a/features/cvmfs/rpms/client-2.1.14-1.pan b/features/cvmfs/rpms/client-2.1.14-1.pan
diff --git a/features/cvmfs/rpms/client-2.1.15-1.pan b/features/cvmfs/rpms/client-2.1.15-1.pan
diff --git a/features/cvmfs/rpms/client-2.1.19-1.pan b/features/cvmfs/rpms/client-2.1.19-1.pan
diff --git a/features/cvmfs/rpms/client.pan b/features/cvmfs/rpms/client.pan