Rename obsproduct to productcompose

openSUSE · Nov 20, 2023 · 92cfd5c · 92cfd5c
1 parent abb1f8b
commit 92cfd5c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Build.pm b/Build.pm
@@ -102,7 +102,7 @@ sub import {
     require Build::Mkosi;
   }
   if ($do_productcompose) {
-    require Build::ObsProduct;
+    require Build::ProductCompose;
   }
 }
 
@@ -199,7 +199,7 @@ my %subst_defaults = (
     'kiwi',
   ],
   'system-packages:productcompose' => [
-    'obs-product-builder',
+    'product-composer',
   ],
   'system-packages:docker' => [
     'docker', 'system-packages:repo-creation',
@@ -1327,7 +1327,7 @@ sub parse {
   return Build::Kiwi::parse($cf, $fn, @args) if $do_kiwi && $fn =~ /\.kiwi$/;
   return Build::LiveBuild::parse($cf, $fn, @args) if $do_livebuild && $fn =~ /\.livebuild$/;
   return Build::Mkosi::parse($cf, $fn, @args) if $do_mkosi && $fn =~ /^mkosi\./;
-  return Build::ObsProduct::parse($cf, $fn, @args) if $do_productcompose && $fn =~ /\.productcompose$/;
+  return Build::ProductCompose::parse($cf, $fn, @args) if $do_productcompose && $fn =~ /\.productcompose$/;
   return parse_typed($cf, $fn, recipe2buildtype($fn), @args);
 }
 
@@ -1337,7 +1337,7 @@ sub parse_typed {
   return Build::Rpm::parse($cf, $fn, @args) if $do_rpm && $buildtype eq 'spec';
   return Build::Deb::parse($cf, $fn, @args) if $do_deb && $buildtype eq 'dsc';
   return Build::Kiwi::parse($cf, $fn, @args) if $do_kiwi && $buildtype eq 'kiwi';
-  return Build::ObsProduct::parse($cf, $fn, @args) if $do_productcompose && $buildtype eq 'productcompose';
+  return Build::ProductCompose::parse($cf, $fn, @args) if $do_productcompose && $buildtype eq 'productcompose';
   return Build::LiveBuild::parse($cf, $fn, @args) if $do_livebuild && $buildtype eq 'livebuild';
   return Build::Snapcraft::parse($cf, $fn, @args) if $do_snapcraft && $buildtype eq 'snapcraft';
   return Build::Appimage::parse($cf, $fn, @args) if $do_appimage && $buildtype eq 'appimage';

diff --git a/Build/ProductComposer.pm b/Build/ProductComposer.pm
@@ -18,7 +18,7 @@
 #
 ################################################################
 
-package Build::ObsProduct;
+package Build::ProductCompose;
 
 use strict;
 use warnings;

diff --git a/build-recipe-productcompose b/build-recipe-productcompose
@@ -28,7 +28,7 @@ recipe_setup_productcompose() {
     mkdir -p "$BUILD_ROOT$TOPDIR"
     mkdir -p "$BUILD_ROOT$TOPDIR/OTHER"
     mkdir -p "$BUILD_ROOT$TOPDIR/SOURCES"
-    mkdir -p "$BUILD_ROOT$TOPDIR/OBSPRODUCT"
+    mkdir -p "$BUILD_ROOT$TOPDIR/PRODUCT"
     # compat, older build versions did not clean TOPDIR ...
     mkdir -p "$BUILD_ROOT$TOPDIR/BUILD"
     mkdir -p "$BUILD_ROOT$TOPDIR/RPMS"
@@ -56,7 +56,7 @@ recipe_prepare_productcompose() {
 }
 
 recipe_build_productcompose() {
-    echo "running obs product builder..."
+    echo "running product composer..."
 
     extra_args=""
     if test -n "$RELEASE" ; then
@@ -65,11 +65,11 @@ recipe_build_productcompose() {
     if test -n "$BUILD_FLAVOR" ; then
 	extra_args=" $extra_args --flavor $BUILD_FLAVOR"
     fi
-    chroot "$BUILD_ROOT" su -c "/usr/bin/obs-product-builder build $extra_args -v --clean $TOPDIR/SOURCES/$RECIPEFILE $TOPDIR/OBSPRODUCT" - abuild < /dev/null && BUILD_SUCCEEDED=true
+    chroot "$BUILD_ROOT" su -c "/usr/bin/product-composer build $extra_args -v --clean $TOPDIR/SOURCES/$RECIPEFILE $TOPDIR/PRODUCT" - abuild < /dev/null && BUILD_SUCCEEDED=true
 }
 
 recipe_resultdirs_productcompose() {
-    echo OBSPRODUCT
+    echo PRODUCT
 }
 
 recipe_cleanup_productcompose() {