Merge branch 'install-manifest-tweak' into 'main'

build-sys: Make target dir for install-manifests configurable

See merge request fedora/bootc/base-images!141

Containerfile

@@ -34,6 +34,8 @@ set -xeuo pipefail
 # Put our manifests into the builder image in the same location they'll be in the
 # final image.
 ./install-manifests
+# And embed the rebuild script
+install -m 0755 -t /usr/libexec ./bootc-base-imagectl
 # Verify that listing works
 /usr/libexec/bootc-base-imagectl list >/dev/null
 # Run the build script in the same way we expect custom images to do, and also

install-manifests

@@ -2,7 +2,7 @@
 set -xeuo pipefail
 # This script copies the manifests from the current directory
 # into their installed location.
-manifestdir=/usr/share/doc/bootc-base-imagectl/manifests
+manifestdir=${1:-/usr/share/doc/bootc-base-imagectl/manifests}
 mkdir -p "$manifestdir/"
 for image in minimal standard tier-x; do
     # Embed the generic defaults
@@ -14,5 +14,3 @@ done
 ln -s fedora-standard.yaml $manifestdir/default.yaml
 # And install dependency manifests
 cp -a fedora-includes $manifestdir
-# And embed the rebuild script
-install -m 0755 -t /usr/libexec ./bootc-base-imagectl