diff options
| -rwxr-xr-x | .extras/image-builder/build-sbo-testbuild.sh | 16 | ||||
| -rw-r--r-- | .extras/image-builder/lib.sh | 5 |
2 files changed, 11 insertions, 10 deletions
diff --git a/.extras/image-builder/build-sbo-testbuild.sh b/.extras/image-builder/build-sbo-testbuild.sh index e71e146..4364cd5 100755 --- a/.extras/image-builder/build-sbo-testbuild.sh +++ b/.extras/image-builder/build-sbo-testbuild.sh @@ -28,13 +28,13 @@ else BUILD_VARIANTS=("${VARIANTS[@]}") fi -# Verify the required .txz are present before doing anything. +# Verify the required packages (*.t?z) are present before doing anything. require_pkgs() { [[ -d "${PKGDIR}" ]] || _err "PKGDIR missing: ${PKGDIR}" - compgen -G "${PKGDIR}/sbopkg-*.txz" >/dev/null \ - || _err "no sbopkg-*.txz in ${PKGDIR}" - compgen -G "${PKGDIR}/sbo-maintainer-tools-*.txz" >/dev/null \ - || _err "no sbo-maintainer-tools-*.txz in ${PKGDIR}" + compgen -G "${PKGDIR}/sbopkg-*.t?z" >/dev/null \ + || _err "no sbopkg-*.t?z in ${PKGDIR}" + compgen -G "${PKGDIR}/sbo-maintainer-tools-*.t?z" >/dev/null \ + || _err "no sbo-maintainer-tools-*.t?z in ${PKGDIR}" } # needs_rebuild FULL_TAG TB_TAG PKGS_HASH -> 0 if rebuild needed @@ -85,13 +85,13 @@ build_variant() { # shellcheck disable=SC2064 trap "rm -rf '${WORKDIR}'" EXIT mkdir -p "${WORKDIR}/pkgs" - cp "${PKGDIR}"/sbopkg-*.txz "${PKGDIR}"/sbo-maintainer-tools-*.txz "${WORKDIR}/pkgs/" + cp "${PKGDIR}"/sbopkg-*.t?z "${PKGDIR}"/sbo-maintainer-tools-*.t?z "${WORKDIR}/pkgs/" cat > "${WORKDIR}/Dockerfile" <<DOCKERFILE FROM ${FULL_TAG} LABEL maintainer="danix <danix@danix.xyz>" -COPY pkgs/*.txz /tmp/pkgs/ -RUN installpkg /tmp/pkgs/*.txz && rm -rf /tmp/pkgs +COPY pkgs/ /tmp/pkgs/ +RUN installpkg /tmp/pkgs/* && rm -rf /tmp/pkgs RUN /sbin/ldconfig LABEL org.opencontainers.image.created="$(date -u +%Y-%m-%dT%H:%M:%SZ)" LABEL org.opencontainers.image.title="SBo test-build env ${VERSION} (x86_64)" diff --git a/.extras/image-builder/lib.sh b/.extras/image-builder/lib.sh index 6cd9e4e..da12fd0 100644 --- a/.extras/image-builder/lib.sh +++ b/.extras/image-builder/lib.sh @@ -46,12 +46,13 @@ fetch() { } # txz_hash DIR -# Stable hash of the set of .txz files in DIR (names + contents), order +# Stable hash of the set of Slackware package files (*.t?z) in DIR (names + +# contents), order # independent. Empty/absent dir -> empty string. txz_hash() { local dir="$1" [[ -d "$dir" ]] || { printf ''; return 0; } - local files; files=$(find "$dir" -maxdepth 1 -name '*.txz' -type f | sort) + local files; files=$(find "$dir" -maxdepth 1 -name '*.t?z' -type f | sort) [[ -n "$files" ]] || { printf ''; return 0; } # Hash sorted "name sha256" lines so reordering does not change output. while IFS= read -r f; do |