[backend] remove unused cbinstall/cbpreinstall code

openSUSE · Apr 24, 2014 · eb2d837 · eb2d837
1 parent 33ff1b2
commit eb2d837
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 24 deletions.
diff --git a/src/backend/bs_repserver b/src/backend/bs_repserver
@@ -2884,14 +2884,10 @@ sub getbuildinfo {
 
   my @pdeps = Build::get_preinstalls($bconf);
   my @vmdeps = Build::get_vminstalls($bconf);
-  my @cbpdeps = Build::get_cbpreinstalls($bconf); # crossbuild preinstall
-  my @cbdeps = Build::get_cbinstalls($bconf);  # crossbuild install
   my %runscripts = map {$_ => 1} Build::get_runscripts($bconf);
   my %bdeps = map {$_ => 1} @bdeps;
   my %pdeps = map {$_ => 1} @pdeps;
   my %vmdeps = map {$_ => 1} @vmdeps;
-  my %cbpdeps = map {$_ => 1} @cbpdeps;
-  my %cbdeps = map {$_ => 1} @cbdeps;
   my %edeps = map {$_ => 1} @edeps;
 
   if ($packtype eq 'kiwi' && $kiwitype eq 'product') {
@@ -2994,7 +2990,7 @@ sub getbuildinfo {
       push @{$allnames{$n}}, $p;
       $dep2pkg{$n} = $p;
     }
-    @bdeps = unify(@pdeps, @vmdeps, @edeps, @bdeps, @cbpdeps, @cbdeps);
+    @bdeps = unify(@pdeps, @vmdeps, @edeps, @bdeps);
     for (@bdeps) {
       for my $p (@{$allnames{$_} || []}) {
 	my $b = {'name' => $_};
@@ -3024,7 +3020,7 @@ sub getbuildinfo {
     return ($ret, $BSXML::buildinfo);
   }
 
-  @bdeps = unify(@pdeps, @vmdeps, @edeps, @bdeps, @cbpdeps, @cbdeps);
+  @bdeps = unify(@pdeps, @vmdeps, @edeps, @bdeps);
   for (@bdeps) {
     my $b = {'name' => $_};
     my $p = $dep2pkg{$_};
@@ -3039,8 +3035,6 @@ sub getbuildinfo {
     $b->{'arch'} = $d->{'arch'} if $d->{'arch'};
     $b->{'preinstall'} = 1 if $pdeps{$_};
     $b->{'vminstall'} = 1 if $vmdeps{$_};
-    $b->{'cbpreinstall'} = 1 if $cbpdeps{$_};
-    $b->{'cbinstall'} = 1 if $cbdeps{$_};
     $b->{'runscripts'} = 1 if $runscripts{$_};
     $b->{'notmeta'} = 1 unless $edeps{$_};
     $b->{'noinstall'} = 1 if $packtype eq 'kiwi' && $edeps{$_} && !($bdeps{$_} || $vmdeps{$_} || $pdeps{$_});

diff --git a/src/backend/bs_sched b/src/backend/bs_sched
@@ -718,22 +718,16 @@ sub set_building {
 
   my @pdeps = Build::get_preinstalls($bconf);
   my @vmdeps = Build::get_vminstalls($bconf);
-  my @cbpdeps = Build::get_cbpreinstalls($bconf); # crossbuild preinstall
-  my @cbdeps = Build::get_cbinstalls($bconf);  # crossbuild install
   my %runscripts = map {$_ => 1} Build::get_runscripts($bconf);
   my %bdeps = map {$_ => 1} @bdeps;
   my %pdeps = map {$_ => 1} @pdeps;
   my %vmdeps = map {$_ => 1} @vmdeps;
-  my %cbpdeps = map {$_ => 1} @cbpdeps;
-  my %cbdeps = map {$_ => 1} @cbdeps;
   my %edeps = map {$_ => 1} @$edeps;
-  @bdeps = unify(@pdeps, @vmdeps, @$edeps, @bdeps, @cbpdeps, @cbdeps);
+  @bdeps = unify(@pdeps, @vmdeps, @$edeps, @bdeps);
   for (@bdeps) {
     $_ = {'name' => $_};
     $_->{'preinstall'} = 1 if $pdeps{$_->{'name'}};
     $_->{'vminstall'} = 1 if $vmdeps{$_->{'name'}};
-    $_->{'cbpreinstall'} = 1 if $cbpdeps{$_->{'name'}};
-    $_->{'cbinstall'} = 1 if $cbdeps{$_->{'name'}};
     $_->{'runscripts'} = 1 if $runscripts{$_->{'name'}};
     $_->{'notmeta'} = 1 unless $edeps{$_->{'name'}};
     $_->{'noinstall'} = 1 if $packtype eq 'kiwi' && $edeps{$_->{'name'}} && !($bdeps{$_->{'name'}} || $vmdeps{$_->{'name'}} || $pdeps{$_->{'name'}});
@@ -6353,9 +6347,7 @@ sub checkpreinstallimage {
   }
   my @pdeps = Build::get_preinstalls($bconf);
   my @vmdeps = Build::get_vminstalls($bconf);
-  my @cbpdeps = Build::get_cbpreinstalls($bconf);
-  my @cbdeps = Build::get_cbinstalls($bconf);
-  @bdeps = unify(@pdeps, @vmdeps, @bdeps, @cbpdeps, @cbdeps);
+  @bdeps = unify(@pdeps, @vmdeps, @bdeps);
 
   # create meta
   my $pool = $ctx->{'pool'};

diff --git a/src/backend/bs_worker b/src/backend/bs_worker
@@ -2239,12 +2239,6 @@ sub dobuild {
   push @rpmlist, "preinstall: ".join(' ', map {$_->{'name'}} grep {$_->{'preinstall'}} @bdep);
   push @rpmlist, "vminstall: ".join(' ', map {$_->{'name'}} grep {$_->{'vminstall'}} @bdep);
   push @rpmlist, "runscripts: ".join(' ', map {$_->{'name'}} grep {$_->{'runscripts'}} @bdep);
-  if (grep {$_->{'cbpreinstall'}} @bdep) {
-    push @rpmlist, "cbpreinstall: ".join(' ', map {$_->{'name'}} grep {$_->{'cbpreinstall'}} @bdep);
-  }
-  if (grep {$_->{'cbinstall'}} @bdep) {
-    push @rpmlist, "cbinstall: ".join(' ', map {$_->{'name'}} grep {$_->{'cbinstall'}} @bdep);
-  }
   writestr("$buildroot/.build.rpmlist", undef, join("\n", @rpmlist)."\n");
 
   print "building...\n";