From: Ken Dreyer <kdreyer@usgs.gov>
Date: Thu, 7 Jul 2011 12:55:51 +0000 (-0400)
Subject: Red Hat: update build script for newer Fedora versions
X-Git-Tag: upstream/1.6.0^2~82
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4786eb20cfcff3965479cfc730d8d18fee5c3c01;p=packages%2Fo%2Fopenafs.git

Red Hat: update build script for newer Fedora versions

Remove old Fedora versions and add the currently-supported ones.

Reviewed-on: http://gerrit.openafs.org/4925
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 8bface302c14698a14b7b988e1a7714e84415c04)

Change-Id: I130c7289e06ede351adf8ace92fcdbac900b7819
Reviewed-on: http://gerrit.openafs.org/5068
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
---

diff --git a/src/packaging/RedHat/mockbuild.pl b/src/packaging/RedHat/mockbuild.pl
index d0706b287..5543c67e4 100755
--- a/src/packaging/RedHat/mockbuild.pl
+++ b/src/packaging/RedHat/mockbuild.pl
@@ -37,47 +37,7 @@ sub findKernels {
 }
 
 
-my %platconf = ( "fedora-5-i386" => { osver => "fc5",
-				      kmod => '1',
-				      basearch => 'i386',
-				      updaterepo => 'updates-released',
-				      results => 'fedora-5/i386' },
-		 "fedora-5-x86_64" => { osver => "fc5",
-				       kmod => '1',
-				       basearch => 'x86_64',
-				       updaterepo => 'updates-released',
-				       results => 'fedora-5/x86_64' },
-		 "fedora-6-i386" => { osver => "fc6", 
-				      kmod => '1', 
-				      basearch => 'i386',
-				      updaterepo => 'updates-released',
-				      results => "fedora-6/i386" },
-		 "fedora-6-x86_64" => { osver => "fc6",
-					kmod => '1',
-					basearch => 'x86_64',
-				        updaterepo => 'updates-released',
-					results => "fedora-6/x86_64" },
-		 "fedora-7-i386" => { osver => "fc7", 
-				      kmod => '1', 
-				      basearch => 'i386',
-				      updaterepo => 'updates-released',
-				      results => "fedora-7/i386" },
-		 "fedora-7-x86_64" => { osver => "fc7",
-					kmod => '1',
-					basearch => 'x86_64',
-				        updaterepo => 'updates-released',
-					results => "fedora-7/x86_64" },
-		 "fedora-8-i386" => { osver => "fc8", 
-				      kmod => '1', 
-				      basearch => 'i386',
-				      updaterepo => 'updates-released',
-				      results => "fedora-8/i386" },
-		 "fedora-8-x86_64" => { osver => "fc8",
-					kmod => '1',
-					basearch => 'x86_64',
-				        updaterepo => 'updates-released',
-					results => "fedora-8/x86_64" },
-		 "centos-4-i386" => { osver => "el4",
+my %platconf = ( "centos-4-i386" => { osver => "el4",
 				     kmod => '1',
 				     basearch => 'i386',
 				     updaterepo => 'update',
@@ -97,57 +57,22 @@ my %platconf = ( "fedora-5-i386" => { osver => "fc5",
 				   	basearch => 'x86_64',
 				        updaterepo => 'update',
 					results => "rhel5/x86_64" },
-		 "fedora-9-i386" => { osver => "fc9",
-				      kmod => '1',
-				      basearch => 'i386',
-				      updaterepo => "updates-released",
-				      results => 'fedora-9/i386' },
-		 "fedora-9-x86_64" => { osver => "fc9",
-					kmod => "1",
-					basearch => "x86_64",
-					updaterepo => "updates-released",
-					results => "fedora-9/x86_64" },
-		 "fedora-10-i386" => { osver => "fc10",
-				      kmod => '1',
-				      basearch => 'i386',
-				      updaterepo => "updates-released",
-				      results => 'fedora-10/i386' },
-		 "fedora-10-x86_64" => { osver => "fc10",
-					kmod => "1",
-					basearch => "x86_64",
-					updaterepo => "updates-released",
-					results => "fedora-10/x86_64" },
-		 "fedora-11-i386" => { osver => "fc11",
-				      kmod => '1',
-				      basearch => 'i386',
-#				      updaterepo => "updates-released",
-				      results => 'fedora-11/i386' },
-		 "fedora-11-x86_64" => { osver => "fc11",
-					kmod => "1",
-					basearch => "x86_64",
-#					updaterepo => "updates-released",
-					results => "fedora-11/x86_64" },
-		 "fedora-12-i386" => { osver => "fc12",
-				      kmod => '1',
-				      basearch => 'i386',
-#				      updaterepo => "updates-released",
-				      results => 'fedora-12/i386' },
-		 "fedora-12-x86_64" => { osver => "fc12",
-					kmod => "1",
-					basearch => "x86_64",
-#					updaterepo => "updates-released",
-					results => "fedora-12/x86_64" },
-                 "fedora-13-i386" => { osver => "fc13",
+                 "fedora-14-i386" => { osver => "fc14",
                                         kmod => "1",
                                         basearch => "i386",
-#                                       updaterepo => "updates-released",
-                                        results => "fedora-13/i386" },
-                 "fedora-13-x86_64" => { osver => "fc13",
+                                        results => "fedora-14/i386" },
+                 "fedora-14-x86_64" => { osver => "fc14",
                                         kmod => "1",
                                         basearch => "x86_64",
-#                                       updaterepo => "updates-released",
-                                        results => "fedora-13/x86_64" },
-
+                                        results => "fedora-14/x86_64" },
+                 "fedora-15-i386" => { osver => "fc15",
+                                        kmod => "1",
+                                        basearch => "i386",
+                                        results => "fedora-15/i386" },
+                 "fedora-15-x86_64" => { osver => "fc15",
+                                        kmod => "1",
+                                        basearch => "x86_64",
+                                        results => "fedora-15/x86_64" },
 		 "fedora-development-i386" => { osver => "fcd",
 					  kmod => '1',
 					  basearch => 'i386',
@@ -257,11 +182,7 @@ foreach my $platform (@platforms) {
       next if ($arch eq "noarch");
       next 
 	  if (exists($badkernels{$version}) && ($badkernels{$version}{$variant}));
-      if ($platform=~/fedora-5/) {
-	  next if ($variant eq "xen0"); # Fedora 5 has some bad xen0 kernel-devels
-	  next if ($variant eq "smp");
-      }
-      next if ($variant =~/debug$/); # Fedora 8 debug kernels are bad
+      next if ($variant =~/debug$/); # Fedora debug kernels are bad
 
       print "$arch : $variant : $version\n";
       $modulelist{$arch} ={} if !$modulelist{$arch};