[backend] fix handling of build time services

Move processing from the source server to the build job creation
code, so that they get added to the correct set of packages.
We also no longer transport them in the normal dependency set, so
that we do not need to extract them.

src/backend/BSSched/BuildJob.pm

@@ -896,13 +896,28 @@ sub create {
 
   my $expanddebug = $ctx->{'expanddebug'};
 
+  # calculate build time service debs
+  my @btdeps;
+  if ($info->{'buildtimeservice'}) {
+    for my $service (@{$info->{'buildtimeservice'} || []}) {
+      if ($bconf->{'substitute'}->{"obs-service:$service"}) {
+	push @btdeps, @{$bconf->{'substitute'}->{"obs-service:$service"}};
+      } else {
+	my $pkgname = "obs-service-$service";
+	$pkgname =~ s/_/-/g if $bconf->{'binarytype'} eq 'deb';
+	push @btdeps, $pkgname;
+      }
+    }
+    @btdeps = BSUtil::unify(@btdeps);
+  }
+
   # calculate sysdeps (cannot cache in the kiwi case)
   my @sysdeps;
   if ($buildtype eq 'kiwi') {
     my $kiwitype = '';
     $kiwitype = $info->{'imagetype'} && $info->{'imagetype'}->[0] eq 'product' ? 'kiwi-product' : 'kiwi-image';
     @sysdeps = grep {/^kiwi-.*:/} @{$info->{'dep'} || []};
-    @sysdeps = Build::get_sysbuild($bconf, $kiwitype, [ @sysdeps,  @{$ctx->{'extradeps'} || []} ]);
+    @sysdeps = Build::get_sysbuild($bconf, $kiwitype, [ @sysdeps, @btdeps, @{$ctx->{'extradeps'} || []} ]);
   } else {
     $ctx->{"sysbuild_$buildtype"} ||= [ Build::get_sysbuild($bconf, $buildtype) ];
     @sysdeps = @{$ctx->{"sysbuild_$buildtype"}};
@@ -912,7 +927,7 @@ sub create {
   # calculate packages needed for building
   my @bdeps = grep {!/^\// || $bconf->{'fileprovides'}->{$_}} @{$info->{'prereq'} || []};
   unshift @bdeps, '--directdepsend--' if @bdeps;
-  unshift @bdeps, @{$info->{'dep'} || []}, @{$ctx->{'extradeps'} || []};
+  unshift @bdeps, @{$info->{'dep'} || []}, @btdeps, @{$ctx->{'extradeps'} || []};
   push @bdeps, '--ignoreignore--' if @sysdeps;
 
   if ($kiwimode || $buildtype eq 'buildenv') {

src/backend/BSXML.pm

@@ -184,6 +184,7 @@ our $packinfo = [
 	'error',
 	  [ 'dep' ],
 	  [ 'prereq' ],
+	  [ 'buildtimeservice' ],
 	  [ 'imagetype' ],	# kiwi
 	  [ 'imagearch' ],	# kiwi
 	    'nodbgpkgs',	# kiwi

src/backend/bs_srcserver

@@ -1600,13 +1600,10 @@ sub getprojpack {
 	    }
             # add all source services to be used at build time
 	    if ($files->{'_service'}) {
-              my $services = BSRevision::revreadxml($rev, '_service', $files->{'_service'}, $BSXML::services, 1);
+              my $services = BSRevision::revreadxml($rev, '_service', $files->{'_service'}, $BSXML::services, 1) || {};
               for my $service (@{$services->{'service'} || []}) {
                 next unless $service->{'mode'} && $service->{'mode'} eq 'buildtime';
-                my $pkgname = "obs-service-$service->{'name'}";
-                # debian does not allow _ in package name
-                $pkgname =~ s/_/-/g if $conf->{'binarytype'} eq 'deb';
-                push @{$rinfo->{'dep'}}, $pkgname;
+                push @{$rinfo->{'buildtimeservice'}}, $service->{'name'};
               }
             }
 	    # KIWI Products support debugmedium and sourcemedium filters