From: Derrick Brashear <shadow@dementix.org>
Date: Fri, 30 Mar 2012 20:15:52 +0000 (-0400)
Subject: linux: make mockbuild more reliable
X-Git-Tag: upstream/1.8.0_pre1^2~2648
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=33903244ae2408dd86ee260d111e74dec0940abd;p=packages%2Fo%2Fopenafs.git

linux: make mockbuild more reliable

previously, a "cached" repo which was assumed to be of the same
releasever and arch of the host was created in /var/tmp,
which would screw up repoquery across a multiple-OS-build.

well, you can tell repoquery what you really mean. so now we do.

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

diff --git a/src/packaging/RedHat/mockbuild.pl b/src/packaging/RedHat/mockbuild.pl
index c2050d072..1708d8bf0 100755
--- a/src/packaging/RedHat/mockbuild.pl
+++ b/src/packaging/RedHat/mockbuild.pl
@@ -23,7 +23,8 @@ my $ignorerelease = 1;
 my @newrpms;
 
 sub findKernels {
-  my ($root, $platform, $uname, @modules) = @_;
+  my ($root, $platform, $uname, $osv, @modules) = @_;
+  $osv =~s/[^\d]//g;
 
   my ($fh, $tmpconf) = tempfile( "yum.confXXXX", DIR => "/tmp");
   open(OLDCONF, "$root/etc/yum.conf");
@@ -53,9 +54,9 @@ sub findKernels {
   my $modlist = join(" ", @modules);
   my @kernels;
   if ($uname) {
-    @kernels = `repoquery $archv --whatprovides kernel-devel-uname-r --qf "%{name}.%{arch} %{version}-%{release}" -c $tmpconf`;
+    @kernels = `repoquery $archv --releasever=$osv --whatprovides kernel-devel-uname-r --qf "%{name}.%{arch} %{version}-%{release}" -c $tmpconf`;
   } else {
-    @kernels = `repoquery $archv --show-duplicates --whatprovides $modlist --qf "%{name}.%{arch} %{version}-%{release}" -c $tmpconf`;
+    @kernels = `strace -o /tmp/out repoquery $archv --releasever=$osv --show-duplicates --whatprovides $modlist --qf "%{name}.%{arch} %{version}-%{release}" -c $tmpconf`;
   }
   unlink $tmpconf;
 
@@ -139,6 +140,22 @@ my %platconf = ( "centos-4-i386" => { osver => "el4",
                                         kmod => "1",
                                         basearch => "x86_64",
                                         results => "fedora-15/x86_64" },
+                 "fedora-16-i386" => { osver => "fc16",
+                                        kmod => "1",
+                                        basearch => "i686",
+                                        results => "fedora-16/i686" },
+                 "fedora-16-x86_64" => { osver => "fc16",
+                                        kmod => "1",
+                                        basearch => "x86_64",
+                                        results => "fedora-16/x86_64" },
+                 "fedora-17-i386" => { osver => "fc17",
+                                        kmod => "1",
+                                        basearch => "i686",
+                                        results => "fedora-16/i686" },
+                 "fedora-17-x86_64" => { osver => "fc17",
+                                        kmod => "1",
+                                        basearch => "x86_64",
+                                        results => "fedora-16/x86_64" },
 		 "fedora-development-i386" => { osver => "fcd",
 					  kmod => '1',
 					  basearch => 'i386',
@@ -230,12 +247,12 @@ foreach my $platform (@platforms) {
 
   my @kernels;
   if ($platform=~/fedora-development/) {
-    @kernels = findKernels($root, $platform, 0, "kernel-devel");
+    @kernels = findKernels($root, $platform, 0, $osver, "kernel-devel");
   } elsif ($platform=~/centos-4/) {
-    @kernels = findKernels($root, $platform, 0, "kernel-devel", "kernel-smp-devel", 
+    @kernels = findKernels($root, $platform, 0, $osver, "kernel-devel", "kernel-smp-devel", 
 				 "kernel-hugemem-devel", "kernel-xenU-devel");
   } else {
-    @kernels = findKernels($root, $platform, 0, 'kernel-devel');
+    @kernels = findKernels($root, $platform, 0, $osver, 'kernel-devel');
   }
 
   foreach my $kernel (@kernels) {