Skip to content

mk-release: anchor output/dist arguments to the caller's cwd #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcfbytes merged 1 commit into from
Sep 16, 2026
Merged

mk-release: anchor output/dist arguments to the caller's cwd #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions scripts/mk-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,15 @@
set -euo pipefail

ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
out=${1:-$ROOT/output}
dist=${2:-$ROOT/dist}
# Anchor both directories to the caller's cwd BEFORE anything changes directory:
# step 4 packs the 7z from inside a `cd`-ed subshell, and release.yml passes
# them relative (`scripts/mk-release.sh output dist`). 7z silently CREATES a
# missing output directory and exits 0, so a relative $dist there does not fail
# the pack -- it writes the archive into the staging tree and everything
# downstream looks for a file that is not where it was asked to go.
abspath() { case $1 in /*) printf '%s\n' "$1" ;; *) printf '%s\n' "$PWD/$1" ;; esac; }
out=$(abspath "${1:-$ROOT/output}")
dist=$(abspath "${2:-$ROOT/dist}")
work=$ROOT/release-work
# shellcheck source=scripts/ci-lib.sh
source "$ROOT/scripts/ci-lib.sh"
Expand Down Expand Up @@ -82,6 +89,7 @@ cp -f "$out/images/linux.img" "$out/images/zImage_dtb" "$out/images/7za" "$work/
find "$work/release-stage/files/linux" -maxdepth 1 -printf ' %f\n' | sort
# Plain solid LZMA2, no BCJ2: the on-device 7za (2016) cannot read BCJ2 streams.
( cd "$work/release-stage" && 7z a -mx=9 -m0=lzma2 -mf=off -ms=on "$dist/release_$release_date.7z" files/ >/dev/null )
[ -f "$dist/release_$release_date.7z" ] || die "7z exited 0 but $dist/release_$release_date.7z does not exist"
echo " wrote $dist/release_$release_date.7z ($(wc -c < "$dist/release_$release_date.7z") bytes)"

# --- 5. round trip under the pinned ARM 7za ----------------------------------------
Expand Down
Loading