my $resultbase="/tmp/result/";
my $stashbase="/disk/scratch/repository/";
my $mockcommand = "/usr/bin/mock";
+my $resultfile;
my $buildall = 0;
my $ignorerelease = 1;
my @newrpms;
kmod => '1',
basearch => 'i386',
updaterepo => 'updates-released',
- results => 'fc5/i386' },
+ results => 'fedora-5/i386' },
"fedora-5-x86_64" => { osver => "fc5",
kmod => '1',
basearch => 'x86_64',
updaterepo => 'updates-released',
- results => 'fc5/x86_64' },
+ results => 'fedora-5/x86_64' },
"fedora-6-i386" => { osver => "fc6",
kmod => '1',
basearch => 'i386',
updaterepo => 'updates-released',
- results => "fc6/i386" },
+ results => "fedora-6/i386" },
"fedora-6-x86_64" => { osver => "fc6",
kmod => '1',
basearch => 'x86_64',
updaterepo => 'updates-released',
- results => "fc6/x86_64" },
+ results => "fedora-6/x86_64" },
"fedora-7-i386" => { osver => "fc7",
kmod => '1',
basearch => 'i386',
updaterepo => 'updates-released',
- results => "fc7/i386" },
+ results => "fedora-7/i386" },
"fedora-7-x86_64" => { osver => "fc7",
kmod => '1',
basearch => 'x86_64',
updaterepo => 'updates-released',
- results => "fc7/x86_64" },
+ results => "fedora-7/x86_64" },
"fedora-8-i386" => { osver => "fc8",
kmod => '1',
basearch => 'i386',
updaterepo => 'updates-released',
- results => "fc8/i386" },
+ results => "fedora-8/i386" },
"fedora-8-x86_64" => { osver => "fc8",
kmod => '1',
basearch => 'x86_64',
updaterepo => 'updates-released',
- results => "fc8/x86_64" },
+ results => "fedora-8/x86_64" },
"centos-4-i386" => { osver => "el4",
kmod => '1',
basearch => 'i386',
updaterepo => 'update',
- results => 'el4/i386' },
+ results => 'rhel4/i386' },
"centos-4-x86_64" => { osver => "el4",
kmod => '1',
basearch => 'x86_64',
updaterepo => 'update',
- results => "el4/x86_64" },
+ results => "rhel4/x86_64" },
"centos-5-i386" => { osver => "el5",
kmod => '1',
basearch => 'i386',
updaterepo => 'update',
- results => "el5/i386" },
+ results => "rhel5/i386" },
"centos-5-x86_64" => { osver => "el5",
kmod => '1',
basearch => 'x86_64',
updaterepo => 'update',
- results => "el5/x86_64" },
+ 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",
+ kmod => "1",
+ basearch => "i386",
+# updaterepo => "updates-released",
+ results => "fedora-13/i386" },
+ "fedora-13-x86_64" => { osver => "fc13",
+ kmod => "1",
+ basearch => "x86_64",
+# updaterepo => "updates-released",
+ results => "fedora-13/x86_64" },
+
"fedora-development-i386" => { osver => "fcd",
kmod => '1',
basearch => 'i386',
my $help;
my $ok = GetOptions("resultdir=s" => \$resultbase,
+ "resultlist=s" => \$resultfile,
"help" => \$help);
my @platforms = @ARGV;
my $oafsversion = `rpm -q --queryformat=%{VERSION} -p $srpm` or die $!;
chomp $oafsversion;
+$oafsversion=~/([0-9]+)\.([0-9]+)\.([0-9]+)/;
+my $major = $1;
+my $minor = $2;
+my $pathlevel = $3;
+
+# OpenAFS SRPMs newer than 1.6.0 use the dist, rather than osvers variable
+
+my $usedist = ($minor >= 6);
+
my $oafsrelease = `rpm -q --queryformat=%{RELEASE} -p $srpm` or die $!;
chomp $oafsrelease;
-$oafsrelease=~s/^[^\.]*\.(.*)$/$1/;
+# Before we used the dist tag, the release variable of the srpm was 1.<release>
+if (!$usedist) {
+ $oafsrelease=~s/^[^\.]*\.(.*)$/$1/;
+}
print "Release is $oafsrelease\n";
if ($platforms[0] eq "all" and $#platforms == 0) {
my $osver = $platconf{$platform}{'osver'};
my $root = $rootbase.$platform."/root";
my $mockresults = $rootbase.$platform."/result";
- my $resultdir = $resultbase.$platconf{$platform}{'results'};
+ my $resultdir = $resultbase."/".$platconf{$platform}{'results'};
my $basearch = $platconf{$platform}{'basearch'};
my $rpmstashdir = $stashbase.$platconf{$platform}{'results'}."/";
next if ($variant eq "xen0"); # Fedora 5 has some bad xen0 kernel-devels
next if ($variant eq "smp");
}
- if ($platform=~/fedora-8/ || $platform=~/fedora-9/ || $platform=~/fedora-development/) {
- next if ($variant =~/debug$/); # Fedora 8 debug kernels are bad
- }
+ next if ($variant =~/debug$/); # Fedora 8 debug kernels are bad
+
print "$arch : $variant : $version\n";
$modulelist{$arch} ={} if !$modulelist{$arch};
$modulelist{$arch}{$version} = {} if !$modulelist{$arch}{$version};
print "-------------------------------------------------------------------\n";
print "Building the userland RPMs\n";
- my @rpms = ('', '-authlibs', '-authlibs-devel', '-client', '-compat',
- '-debuginfo', '-devel', '-docs', '-kernel-source', '-kpasswd',
- '-krb5', '-server');
+ my @rpms = ('openafs', 'openafs-authlibs', 'openafs-authlibs-devel',
+ 'openafs-client', 'openafs-compat', 'openafs-debuginfo',
+ 'openafs-devel', 'openafs-docs', 'openafs-kernel-source',
+ 'openafs-kpasswd', 'openafs-krb5', 'openafs-server',
+ 'dkms-openafs');
+ my @missingrpms=();
my $missing = 0;
foreach my $rpm (@rpms) {
- if (! -f $resultdir."/openafs".$rpm."-".$oafsversion."-".$osver.".".
- $oafsrelease.".".$basearch.".rpm") {
+ my $rpmname;
+ if ($usedist) {
+ $rpmname = $rpm."-".$oafsversion."-".$oafsrelease.".".$osver.".".
+ $basearch.".rpm";
+ } else {
+ $rpmname = $rpm."-".$oafsversion."-".$osver.".".$oafsrelease.".".
+ $basearch.".rpm";
+ }
+ if (! -f $resultdir."/".$rpmname) {
$missing++;
- print $resultdir."/openafs".$rpm."-".$oafsversion."-".$osver.".".
- $oafsrelease.".".$basearch.".rpm is missing!\n"
+ print "$resultdir/$rpmname is missing!\n";
+ push @missingrpms, $rpmname;
}
}
if ($missing) {
' --define "fedorakmod 1" '.
' --define "kernvers '.$arbitraryversion.'" '.
' --define "osvers '.$osver.'" '.
+ ' --define "dist .'.$osver.'" '.
' --define "build_modules 0" '.
' --define "build_userspace 1" '.
' --define "build_authlibs 1" '.
$srpm) == 0
or die "build failed with : $!\n";
- foreach my $rpm (@rpms) {
- system("cp ".$mockresults."/openafs".$rpm."-".$oafsversion."-".
- $osver.".".$oafsrelease.".".$basearch.".rpm ".
- $resultdir) == 0
+ foreach my $rpmname (@missingrpms) {
+ system("cp ".$mockresults."/".$rpmname." ".$resultdir) == 0
or die "Copy failed with : $!\n";
- push @newrpms, $mockresults."/openafs".$rpm."-".$oafsversion."-".
- $osver.".".$oafsrelease.".".$basearch.".rpm";
+ push @newrpms, $resultdir."/".$rpmname;
}
} else {
print "All userland RPMs present for $platform. Skipping build\n";
}
- print "-------------------------------------------------------------------\n";
+ print "-------------------------------------------------------------------\n";
print "Building kernel modules\n";
- foreach my $arch (keys(%modulelist)) {
+ foreach my $arch (keys(%modulelist)) {
foreach my $version (keys(%{$modulelist{$arch}})) {
my $kversion = $version;
$kversion=~s/-/_/g;
" --arch ".$arch.
' --define "fedorakmod 1" '.
' --define "osvers '.$osver.'" '.
+ ' --define "dist .'.$osver.'" '.
' --define "kernvers '.$version.'" '.
' --define "kvariants '.$variants.'" '.
' --define "build_modules 1" '.
}
system("cp ".$mockresults."/kmod-openafs-".$variant.$oafsversion."-".$oafsrelease.".".$kversion.".".$arch.".rpm $resultdir") == 0
or die "Copy failed with : $!\n";
- push @newrpms, $mockresults."/kmod-openafs-".$variant.$oafsversion."-".$oafsrelease.".".$kversion.".".$arch.".rpm";
+ push @newrpms, $resultdir."/kmod-openafs-".$variant.$oafsversion."-".$oafsrelease.".".$kversion.".".$arch.".rpm";
}
} else {
print "All kernel modules already built for $version on $arch\n";
print "=====================================================================\n";
print "All builds complete\nBuilt:\n";
print join("\n",@newrpms);
+if (defined($resultfile)) {
+ my $resultfh=new IO::File $resultfile, 'w';
+ print $resultfh join("\n",@newrpms);
+}