Skip to content

runPh5: make the downstream patch an explicit input, and record provenance #318

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

Open
dcasota wants to merge 1 commit into
base: master
Choose a base branch
from
Open

runPh5: make the downstream patch an explicit input, and record provenance #318

Show file tree
Hide file tree
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
67 changes: 62 additions & 5 deletions staging/runPh5_normal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ echo "[runPh5_normal] Image type: $IMG_TYPE"
# Directory containing this script, used to locate the bundled downstream
# patch set (staging/photonos-patches/). Resolved before any cd.
SCRIPT_DIR=$(cd "$(dirname "$0")" 2>/dev/null && pwd)
SCRIPT_TAG=$(basename "$0" .sh)

sleep 3
if ping -c 4 www.google.ch > /dev/null 2>&1; then
Expand Down Expand Up @@ -125,11 +126,48 @@ if ping -c 4 www.google.ch > /dev/null 2>&1; then
# linux 6.12.96-10 : strip canister Kconfig when fips=0 (PR #14)
# (nginx PR #17 is intentionally NOT included: 5.0 already ships nginx
# 1.30.2, newer than the PR's 1.30.1, so it would be a downgrade.)
DOWNSTREAM_PATCH=""
for cand in "$SCRIPT_DIR/photonos-patches/downstream-fixes.patch" \
"$BASE_DIR/photonos-patches/downstream-fixes.patch"; do
[ -f "$cand" ] && DOWNSTREAM_PATCH="$cand" && break
done
# -- Resolve the downstream patch --------------------------------------
# Precedence: an explicit DOWNSTREAM_PATCH from the caller, else the
# historical search. With the variable unset this behaves exactly as before,
# so the standalone "just run it" path is unchanged.
#
# Why explicit-first: this script resolves the patch RELATIVE TO ITSELF, so
# two checkouts of it see two different patches. When those diverge, the
# build silently uses whichever copy sits beside the script that was
# invoked, and the failure surfaces as "patch does not apply" against a spec
# -- which reads like a rebase problem rather than a path problem. An
# automated driver previously had no way to say which patch it meant.
if [ -n "${DOWNSTREAM_PATCH:-}" ]; then
[ -f "$DOWNSTREAM_PATCH" ] || {
echo "[$SCRIPT_TAG] ERROR: DOWNSTREAM_PATCH=$DOWNSTREAM_PATCH does not exist" 1>&2
exit 1
}
echo "[$SCRIPT_TAG] downstream patch: $DOWNSTREAM_PATCH (caller-specified)"
else
DOWNSTREAM_PATCH=""
_cands=""
for cand in "$SCRIPT_DIR/photonos-patches/downstream-fixes.patch" \
"$BASE_DIR/photonos-patches/downstream-fixes.patch"; do
[ -f "$cand" ] || continue
_cands="$_cands $cand"
[ -n "$DOWNSTREAM_PATCH" ] || DOWNSTREAM_PATCH="$cand"
done
# Ambiguity is refused, not silently resolved. Identical copies are fine;
# copies that differ mean the build would otherwise be a coin toss.
if [ "$(echo $_cands | wc -w)" -gt 1 ]; then
if [ "$(for c in $_cands; do sha256sum "$c" | cut -c1-16; done | sort -u | wc -l)" -gt 1 ]; then
echo "[$SCRIPT_TAG] ERROR: several downstream-fixes.patch copies exist and they DIFFER:" 1>&2
for c in $_cands; do
echo "[$SCRIPT_TAG] $c ($(grep -c '^+++ ' "$c") files, sha $(sha256sum "$c" | cut -c1-16))" 1>&2
done
echo "[$SCRIPT_TAG] Set DOWNSTREAM_PATCH=<path> to choose deliberately." 1>&2
exit 1
fi
fi
fi
if [ -n "$DOWNSTREAM_PATCH" ]; then
echo "[$SCRIPT_TAG] downstream patch: $DOWNSTREAM_PATCH ($(grep -c '^+++ ' "$DOWNSTREAM_PATCH") files, sha $(sha256sum "$DOWNSTREAM_PATCH" | cut -c1-16))"
fi
if [ -n "$DOWNSTREAM_PATCH" ]; then
# Files the patch *creates* survive the "git checkout --" restore above
# (they are untracked), and "git apply" then refuses the whole patch with
Expand Down Expand Up @@ -639,6 +677,25 @@ for s in data.get('sources', []) or []:
fi
if sudo mv "$iso_found" "$dest"; then
echo "[runPh5_normal] Moved ISO to $dest"
# -- Provenance sidecar ------------------------------------------
# An ISO with no record of what produced it cannot be attributed:
# you cannot tell later which patch set, which tree, or which
# installer it actually contains. A driver also should not have to
# scrape "Moved ISO to" out of a log to find the artefact.
{
printf '{\n'
printf ' "iso": "%s",\n' "$dest"
printf ' "iso_sha256": "%s",\n' "$(sha256sum "$dest" | cut -d" " -f1)"
printf ' "img_type": "%s",\n' "$IMG_TYPE"
printf ' "canister_mode": "%s",\n' "$CANISTER_MODE"
printf ' "release_branch": "%s",\n' "$RELEASE_BRANCH"
printf ' "tree_head": "%s",\n' "$(git -C "$BASE_DIR/$RELEASE_BRANCH" rev-parse HEAD 2>/dev/null)"
printf ' "downstream_patch": "%s",\n' "${DOWNSTREAM_PATCH:-}"
printf ' "downstream_patch_sha256": "%s",\n' "$([ -n "${DOWNSTREAM_PATCH:-}" ] && sha256sum "$DOWNSTREAM_PATCH" | cut -d" " -f1)"
printf ' "built_at": "%s"\n' "$(date -u +%Y-%m-%dT%H:%M:%SZ)"
printf '}\n'
} > "${dest%.iso}.build-manifest.json"
echo "[runPh5_normal] Manifest: ${dest%.iso}.build-manifest.json"
exit 0
fi
echo "[runPh5_normal] ERROR: could not move ISO to $dest" 1>&2
Expand Down
48 changes: 43 additions & 5 deletions staging/runPh5_pinned90.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ trap 'rm -f /tmp/photon-tdnf-exclude-pkgs.txt' EXIT INT TERM
# Directory containing this script, used to locate the bundled downstream
# patch set (staging/photonos-patches/). Resolved before any cd.
SCRIPT_DIR=$(cd "$(dirname "$0")" 2>/dev/null && pwd)
SCRIPT_TAG=$(basename "$0" .sh)

sleep 3
if ping -c 4 www.google.ch > /dev/null 2>&1; then
Expand Down Expand Up @@ -120,11 +121,48 @@ with open('build-config.json','w') as f: json.dump(cfg, f, indent=4); f.write('\
# linux 6.12.87-3 : strip canister Kconfig when fips=0 (PR #14)
# (nginx PR #17 is intentionally NOT included: 5.0 already ships nginx
# 1.30.2, newer than the PR's 1.30.1, so it would be a downgrade.)
DOWNSTREAM_PATCH=""
for cand in "$SCRIPT_DIR/photonos-patches/downstream-fixes.patch" \
"$BASE_DIR/photonos-patches/downstream-fixes.patch"; do
[ -f "$cand" ] && DOWNSTREAM_PATCH="$cand" && break
done
# -- Resolve the downstream patch --------------------------------------
# Precedence: an explicit DOWNSTREAM_PATCH from the caller, else the
# historical search. With the variable unset this behaves exactly as before,
# so the standalone "just run it" path is unchanged.
#
# Why explicit-first: this script resolves the patch RELATIVE TO ITSELF, so
# two checkouts of it see two different patches. When those diverge, the
# build silently uses whichever copy sits beside the script that was
# invoked, and the failure surfaces as "patch does not apply" against a spec
# -- which reads like a rebase problem rather than a path problem. An
# automated driver previously had no way to say which patch it meant.
if [ -n "${DOWNSTREAM_PATCH:-}" ]; then
[ -f "$DOWNSTREAM_PATCH" ] || {
echo "[$SCRIPT_TAG] ERROR: DOWNSTREAM_PATCH=$DOWNSTREAM_PATCH does not exist" 1>&2
exit 1
}
echo "[$SCRIPT_TAG] downstream patch: $DOWNSTREAM_PATCH (caller-specified)"
else
DOWNSTREAM_PATCH=""
_cands=""
for cand in "$SCRIPT_DIR/photonos-patches/downstream-fixes.patch" \
"$BASE_DIR/photonos-patches/downstream-fixes.patch"; do
[ -f "$cand" ] || continue
_cands="$_cands $cand"
[ -n "$DOWNSTREAM_PATCH" ] || DOWNSTREAM_PATCH="$cand"
done
# Ambiguity is refused, not silently resolved. Identical copies are fine;
# copies that differ mean the build would otherwise be a coin toss.
if [ "$(echo $_cands | wc -w)" -gt 1 ]; then
if [ "$(for c in $_cands; do sha256sum "$c" | cut -c1-16; done | sort -u | wc -l)" -gt 1 ]; then
echo "[$SCRIPT_TAG] ERROR: several downstream-fixes.patch copies exist and they DIFFER:" 1>&2
for c in $_cands; do
echo "[$SCRIPT_TAG] $c ($(grep -c '^+++ ' "$c") files, sha $(sha256sum "$c" | cut -c1-16))" 1>&2
done
echo "[$SCRIPT_TAG] Set DOWNSTREAM_PATCH=<path> to choose deliberately." 1>&2
exit 1
fi
fi
fi
if [ -n "$DOWNSTREAM_PATCH" ]; then
echo "[$SCRIPT_TAG] downstream patch: $DOWNSTREAM_PATCH ($(grep -c '^+++ ' "$DOWNSTREAM_PATCH") files, sha $(sha256sum "$DOWNSTREAM_PATCH" | cut -c1-16))"
fi
if [ -n "$DOWNSTREAM_PATCH" ]; then
if git apply --check "$DOWNSTREAM_PATCH" 2>/dev/null; then
git apply "$DOWNSTREAM_PATCH" && echo "[runPh5_pinned90] Applied downstream-fixes.patch"
Expand Down