Add support for _manifest files

Author: mlschroe

PBuild/Manifest.pm

@@ -0,0 +1,71 @@
+################################################################
+#
+# Copyright (c) 2026 SUSE LLC
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 or 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program (see the file COPYING); if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+#
+################################################################
+
+package PBuild::Manifest;
+
+use PBuild::Util;
+use PBuild::Source;
+
+sub read_manifest {
+  my ($dir) = @_;
+  eval { require YAML::XS; $YAML::XS::LoadBlessed = 0; };
+  die("Need YAML::XS to parse the _manifest file\n") unless defined &YAML::XS::LoadFile;
+  my $manifest = eval { YAML::XS::LoadFile("$dir/_manifest") };
+  die("Could not parse _manifest file: $@") if $@;
+  die("Bad _manifest file\n") unless ref($manifest) eq 'HASH';
+  return $manifest;
+}
+
+sub find_packages {
+  my ($root_dir, $pkg_dirs) = @_;
+  $seend_sd ||= {};
+  my $manifest = read_manifest($root_dir);
+  my @pkgs;
+  my @skippkgs;
+  if (ref($manifest->{'packages'}) eq 'ARRAY') {
+    for my $pkg (@{$manifest->{'packages'}}) {
+      next if !defined($pkg) || ref($pkg) || $pkg eq '' || $pkg eq '.' || $pkg eq '..' || $pkg =~ /^\//;
+      my $pkgdir = "$root_dir/$pkg";
+      push @skippkgs, $1 if $pkg =~ /^([^\/]+)\//;
+      $pkg =~ s/.*\///;
+      next if $pkg eq '' || $pkg =~ /^[\._]/;
+      next if $pkg_dirs->{$pkg} || !-d $pkgdir;
+      push @pkgs, $pkg;
+      $pkg_dirs->{$pkg} = $pkgdir;
+    }
+  }
+  if (ref($manifest->{'subdirectories'}) eq 'ARRAY') {
+    for my $sd (@{$manifest->{'subdirectories'}}) {
+      next if !defined($sd) || ref($sd) || $sd eq '' || $sd eq '.' || $sd eq '..' || $sd =~ /^\//;
+      next unless -d "$root_dir/$sd";
+      push @skippkgs, $1 if $sd =~ /^([^\/]+)/;
+      push @pkgs, find_packages("$root_dir/$sd", $pkg_dirs);
+    }
+  }
+  if (!exists($manifest->{'packages'})) {
+    @skippkgs = grep {!$pkg_dirs->{$_}} PBuild::Util::unify(@skippkgs);
+    $pkg_dirs->{$_} = 1 for @skippkgs;
+    push @pkgs, PBuild::Source::find_packages($root_dir, $pkg_dirs);
+    delete $pkg_dirs->{$_} for @skippkgs;
+  }
+  return @pkgs;
+}
+
+1;

PBuild/Recipe.pm

@@ -206,12 +206,6 @@ sub split_hostdeps {
 
 sub looks_like_packagedir {
   my ($dir) = @_;
-  return 0 if -d "$dir/.pbuild";
-  return 0 if -d "$dir/_pbuild";
-  return 0 if -d "$dir/_config";
-  return 1 if -d "$dir/../.pbuild";
-  return 1 if -d "$dir/../_pbuild";
-  return 1 if -d "$dir/../_config";
   my @files = PBuild::Util::ls($dir);
   return 0 if grep {/^_build\./} @files;
   for my $file (@files) {

PBuild/Source.pm

@@ -25,13 +25,30 @@ use Digest::MD5;
 
 use PBuild::Util;
 
-sub find_packages {
+sub find_root_dir {
   my ($dir) = @_;
+  return undef unless $dir =~ /^\//;
+  my $configdir;
+  for my $i (1..3) {
+    last if $dir eq '' || $dir eq '/';
+    return $dir if -e "$dir/.pbuild";
+    return $dir if -e "$dir/_pbuild";
+    return $dir if -e "$dir/_manifest";
+    $configdir = $dir if -e "$dir/_config";
+    last unless $dir =~ s/\/[^\/]*$//;
+  }
+  return $configdir;
+}
+
+sub find_packages {
+  my ($root_dir, $pkgdirs) = @_;
   my @pkgs;
-  for my $pkg (sort(PBuild::Util::ls($dir))) {
+  for my $pkg (sort(PBuild::Util::ls($root_dir))) {
     next if $pkg =~ /^[\._]/;
-    next unless -d "$dir/$pkg";
+    next unless -d "$root_dir/$pkg";
+    next if $pkgdirs->{$pkg};	# only one package please
     push @pkgs, $pkg;
+    $pkgdirs->{$pkg} = "$root_dir/$pkg";
   }
   return @pkgs;
 }

pbuild

@@ -38,6 +38,7 @@ use Build;
 
 use PBuild::Source;
 use PBuild::Recipe;
+use PBuild::Manifest;
 use PBuild::AssetMgr;
 use PBuild::RepoMgr;
 use PBuild::LocalRepo;
@@ -62,9 +63,12 @@ my $dir = @dirs ? $dirs[0] : '.';
 $dir = Cwd::abs_path($dir) if $dir !~ /^\//;
 $dir =~ s/(.)\/+$/$1/s;
 
-# autodetect single mode
-if (!exists($opts->{'single'}) && PBuild::Recipe::looks_like_packagedir($dir)) {
-  $opts->{'single'} = $1 if $dir =~ s/\/([^\/]+)$//;
+# find root directory and autodetect single mode
+my $root_dir = PBuild::Source::find_root_dir($dir);
+$root_dir = $1 if !$root_dir && PBuild::Recipe::looks_like_packagedir($dir) && $dir =~ /^(.*)\/[^\/]+$/;
+if ($root_dir && $dir ne $root_dir) {
+  $opts->{'single'} = $1 if !exists($opts->{'single'}) && $dir =~ /\/([^\/]+)$/;
+  $dir = $root_dir;
 }
 
 if ($opts->{'list-presets'}) {
@@ -274,7 +278,13 @@ if ($cross && @{$opts->{'hostrepo'} || []}) {
   print "      - $_\n" for @{$opts->{'hostrepo'}};
 }
 print "searching for packages\n";
-my @pkgs = PBuild::Source::find_packages($dir);
+my %pkgdirs;
+my @pkgs;
+if (-s "$dir/_manifest") {
+  @pkgs = PBuild::Manifest::find_packages($dir, \%pkgdirs);
+} else {
+  @pkgs = PBuild::Source::find_packages($dir, \%pkgdirs);
+}
 die("no packages found in '$dir'\n") unless @pkgs || $opts->{'repoquery'} || $opts->{'repoquery-host'};
 print "found ".PBuild::Util::plural(scalar(@pkgs), 'package')."\n";
 
@@ -289,7 +299,7 @@ for my $pkg (@pkgs) {
   my ($files, $source_assets) = PBuild::Source::list_package("$dir/$pkg");
   my $p = {
     'pkg' => $pkg,
-    'dir' => "$dir/$pkg",
+    'dir' => $pkgdirs{$pkg},
     'files' => $files,
     'srcmd5' => PBuild::Source::calc_srcmd5($files),
     'srcmd5' => PBuild::Source::calc_srcmd5($files),