diff --git a/builder/Makefile b/builder/Makefile index 2bf2bc5..74615ca 100644 --- a/builder/Makefile +++ b/builder/Makefile @@ -106,5 +106,5 @@ $(foreach artifact_rule,$(shell ./make_get_artifact_rules),$(eval $(call artifac ln -f -s -r '$<' '.build/$*' # prevents match anything rule from applying to Makefile and image/convert scripts -Makefile image image.release image.manifest image.sbom image.sourcemanifest image.requirements $(shell find features -name 'convert.*' -o -name image -o -name 'image.*'): +Makefile image image.release image.manifest image.sbom image.requirements $(shell find features -name 'convert.*' -o -name image -o -name 'image.*'): true diff --git a/builder/image.sourcemanifest b/builder/image.sourcemanifest deleted file mode 100755 index b59cb04..0000000 --- a/builder/image.sourcemanifest +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env bash - -set -eufo pipefail - -chroot_dir="$(mktemp -d)" -mount -t tmpfs tmpfs "$chroot_dir" -tar --extract --xattrs --xattrs-include '*' --directory "$chroot_dir" < "$1" - -mount --rbind --make-rslave /proc "$chroot_dir/proc" - -#shellcheck disable=SC2016 -chroot "$chroot_dir" dpkg-query --show --showformat='${source:Package}\n' | sort | uniq > "$2" - -umount -l "$chroot_dir/proc" - -umount "$chroot_dir" -rmdir "$chroot_dir" diff --git a/builder/make_get_artifact_rules b/builder/make_get_artifact_rules index 43c29cd..9daecdb 100755 --- a/builder/make_get_artifact_rules +++ b/builder/make_get_artifact_rules @@ -3,7 +3,7 @@ set -euo pipefail shopt -s nullglob -extensions=(release manifest sbom sourcemanifest requirements raw) +extensions=(release manifest sbom requirements raw) for feature in "features/"*; do for i in "$feature/"{image,convert}.*; do diff --git a/builder/make_list_build_artifacts b/builder/make_list_build_artifacts index fd44719..12f0d1e 100755 --- a/builder/make_list_build_artifacts +++ b/builder/make_list_build_artifacts @@ -7,7 +7,7 @@ cname="$1" IFS=',' read -r -a features < <(./parse_features --allow-frankenstein --feature-dir features --cname "$cname" features) -artifacts=(".build/$cname-$COMMIT.tar" ".build/$cname-$COMMIT.release" ".build/$cname-$COMMIT.manifest" ".build/$cname-$COMMIT.sbom" ".build/$cname-$COMMIT.sourcemanifest" ".build/$cname-$COMMIT.requirements") +artifacts=(".build/$cname-$COMMIT.tar" ".build/$cname-$COMMIT.release" ".build/$cname-$COMMIT.manifest" ".build/$cname-$COMMIT.sbom" ".build/$cname-$COMMIT.requirements") for feature in "${features[@]}"; do for i in "features/$feature/"{image,convert}.*; do @@ -18,7 +18,7 @@ for feature in "${features[@]}"; do done done -if [ "${#artifacts[@]}" = 6 ] && [ -n "$(./parse_features --allow-frankenstein --feature-dir "features" --cname "$cname" platforms)" ]; then +if [ "${#artifacts[@]}" = 5 ] && [ -n "$(./parse_features --allow-frankenstein --feature-dir "features" --cname "$cname" platforms)" ]; then artifacts+=(".build/$cname-$COMMIT.raw") fi