[backend] fix cross-build code

openSUSE · Feb 16, 2012 · ba487c2 · ba487c2
1 parent 681eb6c
commit ba487c2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/backend/bs_dispatch b/src/backend/bs_dispatch
@@ -369,7 +369,7 @@ while (1) {
 	push @{$crossarchs{$2}}, $1 if /^(.*):([^:]+):cross$/;
       }
       for my $crossarch (sort keys %crossarchs) {
-	next unless $idlearch{$crossarch};
+	next unless $idlearch{$arch};
 	my %cj = map {$_ => 1} ls("$jobsdir/$crossarch");
 	# deltete orphaned marker
 	for (@{$crossarchs{$crossarch}}) {
@@ -574,7 +574,7 @@ while (1) {
 	  last;
 	}
       }
-      my @idle = List::Util::shuffle(@{$idlearch{$ic->{'hostarch'} || $arch} || []});
+      my @idle = List::Util::shuffle(@{$idlearch{$ic->{$job}->{'hostarch'} || $arch} || []});
       last unless @idle;
       my %poweridle;
       if ($powerjobs{$job}) {

diff --git a/src/backend/bs_sched b/src/backend/bs_sched
@@ -516,7 +516,7 @@ sub add_crossmarker {
   my $hostarch = $bconf->{'hostarch'};
   return if $hostarch eq $myarch;
   return unless $BSCando::knownarch{$hostarch};
-  my $marker = "$jobsdir/$hostarch/$job:$hostarch:cross";
+  my $marker = "$jobsdir/$hostarch/$job:$myarch:cross";
   return if -e $marker;
   mkdir_p("$jobsdir/$hostarch");
   BSUtil::touch($marker);