pbuild: use image method for mkosi/simpleimage builds

openSUSE · Oct 14, 2024 · e9113ef · e9113ef
1 parent 7e92b29
commit e9113ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/PBuild/Checker.pm b/PBuild/Checker.pm
@@ -346,7 +346,7 @@ sub genmeta_product {
 sub genmeta {
   my ($ctx, $p, $edeps, $hdeps) = @_;
   my $buildtype = $p->{'buildtype'};
-  return genmeta_image($ctx, $p, $edeps) if $buildtype eq 'kiwi' || $buildtype eq 'docker' || $buildtype eq 'preinstallimage';
+  return genmeta_image($ctx, $p, $edeps) if $buildtype eq 'kiwi' || $buildtype eq 'docker' || $buildtype eq 'preinstallimage' || $buildtype eq 'mkosi' || $buildtype eq 'simpleimage';
   return genmeta_product($ctx, $p, $edeps) if $buildtype eq 'productcompose';
   my $dep2pkg = $p->{'native'} ? $ctx->{'dep2pkg_host'} : $ctx->{'dep2pkg'};
   my $metacache = $ctx->{'metacache'};
@@ -550,7 +550,7 @@ sub check {
   my ($ctx, $p, $incycle) = @_;
 
   my $buildtype = $p->{'buildtype'};
-  return check_image($ctx, $p) if $buildtype eq 'kiwi' || $buildtype eq 'docker' || $buildtype eq 'preinstallimage';
+  return check_image($ctx, $p) if $buildtype eq 'kiwi' || $buildtype eq 'docker' || $buildtype eq 'preinstallimage' || $buildtype eq 'mkosi' || $buildtype eq 'simpleimage';
   return check_product($ctx, $p) if $buildtype eq 'productcompose';
 
   my $packid = $p->{'pkg'};
@@ -829,7 +829,7 @@ sub build {
       $jobopts{'ccache-type'} = $opts->{'ccache-type'};
     }
   }
-  if ($kiwimode || $buildtype eq 'buildenv' || $buildtype eq 'preinstallimage') {
+  if ($kiwimode || $buildtype eq 'buildenv' || $buildtype eq 'preinstallimage' || $buildtype eq 'mkosi' || $buildtype eq 'simpleimage') {
     @bdeps = (1, @$edeps);      # reuse edeps packages, no need to expand again
   } else {
     print "=== builddeps expansion\n" if $expand_dbg;

diff --git a/PBuild/Expand.pm b/PBuild/Expand.pm
@@ -115,7 +115,7 @@ sub expand_deps {
   my ($p, $bconf, $subpacks, $cross) = @_;
   my $buildtype = $p->{'buildtype'} || '';
   return expand_deps_product($p, $bconf, $subpacks, $cross) if $buildtype eq 'productcompose';
-  return expand_deps_image($p, $bconf, $subpacks, $cross) if $buildtype eq 'kiwi' || $buildtype eq 'docker' || $buildtype eq 'fissile' || $buildtype eq 'preinstallimage';
+  return expand_deps_image($p, $bconf, $subpacks, $cross) if $buildtype eq 'kiwi' || $buildtype eq 'docker' || $buildtype eq 'fissile' || $buildtype eq 'preinstallimage' || $buildtype eq 'mkosi' || $buildtype eq 'simpleimage';
   delete $p->{'dep_experror'};
   if ($p->{'error'}) {
     $p->{'dep_expanded'} = [];