Refactor basecontainer handling in pbuild

openSUSE · Oct 1, 2024 · 3312dad · 3312dad
1 parent 39534d2
commit 3312dad
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/PBuild/Job.pm b/PBuild/Job.pm
@@ -192,10 +192,8 @@ sub export_origtar {
 #
 sub findbasecontainer {
   my ($ctx, $p, $bdeps) = @_;
-  my $cname = (grep {/^container:/} @{$p->{'dep'} || []})[-1];
-  return undef unless $cname;
-  my $bconf = $ctx->{'bconf'};
-  my %providers = map {$_ => 1} @{$bconf->{'whatprovidesh'}->{$cname} || []};
+  return undef unless $p->{'basecontainer'};
+  my %providers = map {$_ => 1} Build::whatprovides($ctx->{'bconf'}, $p->{'basecontainer'});
   return (grep {$providers{$_}} @{$bdeps || []})[0];
 }
 

diff --git a/PBuild/Recipe.pm b/PBuild/Recipe.pm
@@ -154,19 +154,20 @@ sub parse {
   if ($p->{'files'}->{'_service'}) {
     push @{$p->{'buildtimeservice'}}, $_ for PBuild::Service::get_buildtimeservices($p);
   }
-  my $imagetype = $bt eq 'kiwi' && $d->{'imagetype'} ? ($d->{'imagetype'}->[0] || '') : '';
-  if ($bt eq 'kiwi' && $imagetype eq 'product') {
+  my $kiwi_imagetype = $bt eq 'kiwi' && $d->{'imagetype'} ? ($d->{'imagetype'}->[0] || '') : '';
+  if ($kiwi_imagetype eq 'product' || $bt eq 'productcompose') {
     $p->{'nodbgpkgs'} = 1 if defined($d->{'debugmedium'}) && $d->{'debugmedium'} <= 0;
     $p->{'nosrcpkgs'} = 1 if defined($d->{'sourcemedium'}) && $d->{'sourcemedium'} <= 0;
   }
+  $p->{'basecontainer'} = $d->{'basecontainer'} if $d->{'basecontainer'};
   my $myarch = $bconf->{'target'} ? (split('-', $bconf->{'target'}))[0] : $arch;
   $p->{'error'} = 'excluded' if $d->{'exclarch'} && !grep {$_ eq $myarch} @{$d->{'exclarch'}};
   $p->{'error'} = 'excluded' if $d->{'badarch'} && grep {$_ eq $myarch} @{$d->{'badarch'}};
   $p->{'imagetype'} = $d->{'imagetype'} if $d->{'imagetype'};
 
   $p->{'remoteassets'} = $d->{'remoteassets'} if $d->{'remoteassets'};
   # check if we can build this
-  if ($bt eq 'kiwi' && $imagetype eq 'product') {
+  if ($kiwi_imagetype eq 'product') {
     $p->{'error'} = 'cannot build kiwi products yet';
     return;
   }