Skip to content

Commit

Permalink
Take mkosi.conf's ImageId instead of macro
Browse files Browse the repository at this point in the history
No special macro is needed to set the filename, take ImageID (if set) or
default to "image".
Also no sha256 generateion needs to be done, mkosi creates it for all
files in $OUTPUTDIR in "$IMAGENAME.SHA256SUMS"
  • Loading branch information
cschneemann committed May 29, 2024
1 parent 7df64ea commit c724a54
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions build-recipe-mkosi
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,11 @@ recipe_build_mkosi() {
cp -r "/.build/" "$TOPDIR/scripts"
chmod +x "$TOPDIR/scripts/.build/generate_sbom"
mkdir -p $BUILD_ROOT/$TOPDIR/SOURCES/mkosi.conf.d/99-sbom/
IMAGENAME=$(queryconfig --dist "$BUILD_DIST" --configdir "$CONFIG_DIR" --archpath "$BUILD_ARCH" eval '%{?mkosi_sbom_name}' || "image")
IMAGENAME=$(grep ImageId= "${RECIPEFILE}" | sed "s/\s*ImageId\s*=\s*\(.*\)\s*/\1/")
IMAGENAME=${IMAGENAME:-image}
if [ -n "$RELEASE" ]; then
IMAGENAME="${IMAGENAME}_${RELEASE}"
fi
echo "IMAGENAME= $IMAGENAME"
echo "generating script for sbom $format"
cat << EOF >> $BUILD_ROOT/$TOPDIR/SOURCES/mkosi.conf.d/99-sbom/mkosi.finalize
Expand All @@ -116,10 +119,7 @@ $TOPDIR/scripts/.build/generate_sbom \
--configdir "$TOPDIR/scripts/$CONFIG_DIR" \
--archpath "$BUILD_ARCH" \
--format "$format" \
--dir "$IMAGENAME" > "\$OUTPUTDIR/\${imgname}${buildnum}.${format/cyclonedx/cdx}.json"
pushd \$OUTPUTDIR >/dev/null
/usr/bin/sha256sum "\${imgname}${buildnum}.${format/cyclonedx/cdx}.json" > "\${imgname}${buildnum}.${format/cyclonedx/cdx}.json".sha256
popd >/dev/null
--dir "$IMAGENAME" > "\$OUTPUTDIR/${IMAGENAME}.${format/cyclonedx/cdx}.json"
EOF
chmod +x $BUILD_ROOT/$TOPDIR/SOURCES/mkosi.conf.d/99-sbom/mkosi.finalize
done
Expand Down

0 comments on commit c724a54

Please sign in to comment.