Make generate_sbom errors fatal

They were already fatal in the kiwi code, do the same in the
docker and livebuild cases.

Author: mlschroe

build-recipe-docker

@@ -327,7 +327,7 @@ recipe_build_docker() {
     # create sbom if requested
     for format in $(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags+ sbom | sort -u) ; do
 	echo "Generating $format sbom file"
-	generate_sbom --format "$format" --container-archive "$TOPDIR/DOCKER/$FILENAME.tar" > "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json"
+	generate_sbom --format "$format" --container-archive "$TOPDIR/DOCKER/$FILENAME.tar" > "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" || cleanup_and_exit 1 "generate_sbom failed!"
 	test -s "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json" || rm -f "$BUILD_ROOT$TOPDIR/DOCKER/$FILENAME.${format/cyclonedx/cdx}.json"
     done
 

build-recipe-kiwi

@@ -517,9 +517,7 @@ perform_image_bundle() {
         if test "$imgtype" != docker; then	# done in postprocess_kiwi_containers
             for format in $(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags+ sbom | sort -u) ; do
                 echo "Generating $format sbom file for KIWIROOT-$imgtype"
-                if ! generate_sbom --format "$format" --dir "$BUILD_ROOT/$TOPDIR/KIWIROOT-$imgtype" > "$BUILD_ROOT/$TOPDIR/OTHER/kiwi-sbom.json" ; then
-                    cleanup_and_exit 1 "generate_sbom script failed!"
-                fi
+                generate_sbom --format "$format" --dir "$BUILD_ROOT/$TOPDIR/KIWIROOT-$imgtype" > "$BUILD_ROOT/$TOPDIR/OTHER/kiwi-sbom.json" || cleanup_and_exit 1 "generate_sbom failed!"
                 for packages in "$BUILD_ROOT/$TOPDIR/KIWI.bundle/"*.packages; do
                     cp "$BUILD_ROOT/$TOPDIR/OTHER/kiwi-sbom.json" "${packages%.packages}.${format/cyclonedx/cdx}.json"
                 done

build-recipe-livebuild

@@ -267,12 +267,12 @@ recipe_build_livebuild() {
     BASE_NAME="${RECIPEFILE%.livebuild}-${ARCH}${buildnum}"
     for format in $(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" buildflags+ sbom | sort -u) ; do
         echo "Generating $format sbom file"
-	    pushd $BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT >/dev/null
+	pushd $BUILD_ROOT/$TOPDIR/$LIVEBUILD_ROOT >/dev/null
 
         # ensure pretty subjectname in SBOM
         ln -sf "chroot" "${BASE_NAME}"
 
-        generate_sbom --format "$format" --dir "${BASE_NAME}"  > "$BUILD_ROOT/$TOPDIR/OTHER/${BASE_NAME}.${format/cyclonedx/cdx}.json"
+        generate_sbom --format "$format" --dir "${BASE_NAME}"  > "$BUILD_ROOT/$TOPDIR/OTHER/${BASE_NAME}.${format/cyclonedx/cdx}.json" || cleanup_and_exit 1 "generate_sbom failed!"
         popd >/dev/null
 
         pushd $BUILD_ROOT/$TOPDIR/OTHER >/dev/null