mv OpenHPC.local.repo up to top-level
@@ -133,15 +133,16 @@ foreach my $distro (@distros) {
}
}
- # exclude OBS created .repo file
- $tar_args .= "--exclude $distro/OpenHPC:$release.repo"
+ # exclude any OBS created .repo files
+ $tar_args .= "--exclude $distro/OpenHPC*.repo"
+ $tar_args .= "--exclude $distro/updates/OpenHPC*.repo"
# cd to $tmp_dir
$tar_args .= "-C $tmp_dir \\\n";
# add .repo file
- my $repoFile="$tmp_dir/$distro/OpenHPC.local.repo";
+ my $repoFile="$tmp_dir/OpenHPC.local.repo";
if($skipCopy) {
File::Path::make_path("$tmp_dir/$distro") || die("Unable to create $tmp_dir/$distro\n");
@@ -164,6 +165,7 @@ foreach my $distro (@distros) {
my $contents = $file_update->slurp_utf8;
$contents =~ s/\@VERSION_MINOR\@/$base_release/g;
$contents =~ s/\@VERSION_MICRO\@/$release/g;
+ $contents =~ s/\@DIST\@/$distro/g;
$file_update->spew_utf8( $contents );
# Copy mk_repo utility
@@ -172,7 +174,7 @@ foreach my $distro (@distros) {
chmod 0700, "/tmp_dir/mk_repo" || die "Unable to set perms for mk_repo\n";
# Assemble final tarball
- $tar_args .= "$distro mk_repo";
+ $tar_args .= "$distro mk_repo OpenHPC.local.repo";
print "\nCreating dist tarball for $distro:$arch -- \n";
print "\ntar command -> tar $tar_args\n\n";
system("tar $tar_args");
