From: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date: Tue, 13 Nov 2007 00:33:21 +0000 (+0000)
Subject: STABLE14-redhat-reunrevert-fedora-build-change-20071112
X-Git-Tag: openafs-stable-1_4_7pre1~164
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4c9f972c1bf1455e9a5c4a44c311f64dbab6da3b;p=packages%2Fo%2Fopenafs.git

STABLE14-redhat-reunrevert-fedora-build-change-20071112


"oops"


(cherry picked from commit 606ce43066bf1d818a990982f9704a973371c456)
---

diff --git a/src/packaging/RedHat/openafs-buildfedora.pl b/src/packaging/RedHat/openafs-buildfedora.pl
index 69e37216e..3bbea02ce 100755
--- a/src/packaging/RedHat/openafs-buildfedora.pl
+++ b/src/packaging/RedHat/openafs-buildfedora.pl
@@ -24,12 +24,15 @@ foreach my $variant ('', 'PAE', 'kdump', 'xen') {
     $package=~/([^\-]*\-[^\-]*)\.([^\.]*)$/;
     my ($version, $arch) = ($1,$2);
     die "Couldn't extract version and architecture" if !$version or !$arch;
-    $list{$arch} = {} if !$list{$arch};
-    $list{$arch}{$version} =[] if !$list{$arch}{$version};
-    push @{$list{$arch}{$version}}, $variant;
-  }
+    my @archs=map {/^.*\-([^\-]*)/;$1;} split(' ',`ls -d /usr/src/kernels/$version$append-*`);
+    foreach my $arch (@archs) {
+      print "Adding $variant, version $version for $arch\n";
+      $list{$arch} = {} if !$list{$arch};
+      $list{$arch}{$version} =[] if !$list{$arch}{$version};
+      push @{$list{$arch}{$version}}, $variant;
+    }
+  } 
 }
-
 # Build the base package
 print "Building the base system\n";
 system("rpmbuild -ba --define \"fedorakmod 1\" --define \"osvers fc$fedoraversion\" $specdir/openafs.spec") == 0 or exit 1;