obsproduct: make source and debug packages optional

openSUSE · Nov 17, 2023 · 07f2808 · 07f2808
1 parent 4ed7260
commit 07f2808
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Build/ObsProduct.pm b/Build/ObsProduct.pm
@@ -87,9 +87,12 @@ sub parse {
 
   # can we live without additional repository config?
 
-  # currently always on
-  $ret->{'sourcemedium'} = 1;
-  $ret->{'debugmedium'} = 1;
+  # Do we need source or debug packages?
+  my $bo = $data->{'build_options'};
+  if ($bo) {
+    $ret->{'sourcemedium'} = 1 if $bo->{'source'};
+    $ret->{'debugmedium'} = 1 if $bo->{'debug'};
+  }
 
   return $ret;
 }

diff --git a/build-recipe-obsproduct b/build-recipe-obsproduct
@@ -58,8 +58,6 @@ recipe_prepare_obsproduct() {
 recipe_build_obsproduct() {
     echo "running obs product builder..."
 
-    chroot "$BUILD_ROOT" chown -R abuild.abuild "$TOPDIR"
-
     extra_args=""
     if test -n "$RELEASE" ; then
 	extra_args=" $extra_args --release $RELEASE"

diff --git a/expanddeps b/expanddeps
@@ -382,7 +382,7 @@ Build::readdeps($cf, undef, \%repo);
 
 my @sysdeps = Build::get_sysbuild($cf, $buildtype, $extrasysdeps);
 
-if ($buildtype eq 'kiwi-image' || $buildtype eq 'kiwi-product') {
+if ($buildtype eq 'kiwi-image' || $buildtype eq 'kiwi-product' || $buildtype eq 'obsproduct') {
   if (!shift @sysdeps) {
     print STDERR "expansion error\n";
     print STDERR "  $_\n" for @sysdeps;