vasilito
5e7fadb9ca
redbear-ci / check (push) Has been cancelled
Converting [source] git=/tar= to path="source" removed the URL cookbook parsed
the package version from, so non-Cargo recipes without an explicit
[package].version failed at packaging ('cannot guess version', hit on
ninja-build). Add version = "0.3.1" (the branch version, matching the vendored
convention e.g. brush) to the 3 affected recipes, and make vendor-recipe.sh add
it automatically on future conversions.
105 lines
5.3 KiB
Bash
Executable File
105 lines
5.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# vendor-recipe.sh — convert a transient recipe (fetches upstream at build time)
|
|
# into a vendored full-fork recipe (builds from a committed source/ tree, offline).
|
|
#
|
|
# For each recipe:
|
|
# 1. `repo fetch` it — cookbook clones/extracts upstream into source/ and BAKES
|
|
# the recipe's patches in ([ATOMIC] N/N patches applied).
|
|
# 2. Strip any embedded .git (git-fetched sources carry one; committing it would
|
|
# store a useless gitlink instead of the files).
|
|
# 3. Rewrite [source] to `path = "source"` (cookbook then uses source/ as-is, no
|
|
# network), preserving the upstream url/rev/blake3/patches as a provenance
|
|
# comment. The .patch files stay tracked so a version bump can re-apply them.
|
|
# 4. Drop any `.../source` line from .gitignore so the tree is committable.
|
|
# 5. Stamp source/.redbear-src-version.
|
|
# Leaves everything staged-but-uncommitted for review (unless --commit).
|
|
#
|
|
# Usage: vendor-recipe.sh [--commit] <recipe>... (recipe = dir or name)
|
|
set -uo pipefail
|
|
ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
|
|
REPO="$ROOT/target/release/repo"
|
|
COMMIT=0; declare -a WANT=()
|
|
for a in "$@"; do case "$a" in --commit) COMMIT=1;; --*) echo "unknown: $a">&2; exit 1;; *) WANT+=("$a");; esac; done
|
|
|
|
resolve(){ local t="${1%/}"; t="${t#"$ROOT"/}"; t="${t#local/recipes/}"
|
|
[ -f "$ROOT/local/recipes/$t/recipe.toml" ] && { echo "$ROOT/local/recipes/$t"; return; }
|
|
local h; h=$(find "$ROOT/local/recipes" -name recipe.toml -not -path '*/wip/*' -path "*/$t/recipe.toml" 2>/dev/null|head -1)
|
|
[ -n "$h" ] && echo "$(dirname "$h")"; }
|
|
|
|
rc=0
|
|
for tok in "${WANT[@]}"; do
|
|
dir="$(resolve "$tok")"; [ -n "$dir" ] || { echo "!! not found: $tok">&2; rc=1; continue; }
|
|
name="$(basename "$dir")"
|
|
if grep -qE '^\s*path\s*=\s*"source"' "$dir/recipe.toml"; then echo "[$name] already vendored (path=source)"; continue; fi
|
|
|
|
echo "[$name] fetching (bakes patches)…"
|
|
if ! ( cd "$ROOT" && REDBEAR_CANONICAL_BUILD=1 REPO_OFFLINE=0 COOKBOOK_OFFLINE=false "$REPO" fetch "$name" ) >/"$ROOT"/.vendor-fetch.log 2>&1; then
|
|
echo "[$name] FETCH/PATCH FAILED — see .vendor-fetch.log (likely a broken patch to fix by hand)"; rc=1; continue
|
|
fi
|
|
[ -d "$dir/source" ] || { echo "[$name] no source/ after fetch"; rc=1; continue; }
|
|
rm -rf "$dir/source/.git"
|
|
|
|
# capture provenance (bash) for the stamp before the [source] rewrite
|
|
up_url="$(grep -m1 -E '^\s*(tar|git)\s*=' "$dir/recipe.toml" | grep -oE '"[^"]+"' | tr -d '"')"
|
|
up_rev="$(grep -m1 -E '^\s*rev\s*=' "$dir/recipe.toml" | grep -oE '"[^"]+"' | tr -d '"')"
|
|
stamp="${up_rev:-}"; [ -z "$stamp" ] && stamp="$(basename "${up_url:-unknown}")"
|
|
|
|
# rewrite [source] -> path="source" + provenance comment, via python
|
|
python3 - "$dir/recipe.toml" <<'PY'
|
|
import re,sys
|
|
p=sys.argv[1]; s=open(p).read()
|
|
m=re.search(r'(?ms)^\[source\]\s*\n(.*?)(?=^\[|\Z)', s)
|
|
if not m: sys.exit(0)
|
|
body=m.group(1)
|
|
def val(k):
|
|
mm=re.search(r'^\s*%s\s*=\s*"([^"]*)"'%k, body, re.M); return mm.group(1) if mm else None
|
|
url=val('tar') or val('git'); rev=val('rev'); blake=val('blake3')
|
|
pats=re.findall(r'"([^"]+\.patch)"', body)
|
|
c=['[source]',
|
|
'# Vendored local fork (full-fork model): builds from the committed source/',
|
|
'# tree (offline, reproducible). source/ = pristine upstream + the patches below',
|
|
'# BAKED IN. .patch files kept tracked so a version bump can re-apply them via',
|
|
'# sync-recipe-source.sh.']
|
|
if url: c.append('# upstream: %s'%url)
|
|
if rev: c.append('# rev: %s'%rev)
|
|
if blake: c.append('# blake3: %s'%blake)
|
|
for pt in pats: c.append('# patch (baked): %s'%pt)
|
|
c.append('path = "source"')
|
|
s=s[:m.start()]+'\n'.join(c)+'\n\n'+s[m.end():]
|
|
open(p,'w').write(s)
|
|
PY
|
|
|
|
# un-ignore
|
|
if grep -qE "^local/recipes/.*/$name/source" "$ROOT/.gitignore" 2>/dev/null; then
|
|
grep -vE "^local/recipes/.*/$name/source" "$ROOT/.gitignore" > "$ROOT/.gitignore.tmp" && mv "$ROOT/.gitignore.tmp" "$ROOT/.gitignore"
|
|
fi
|
|
# stamp
|
|
printf '%s\n' "$stamp" > "$dir/source/.redbear-src-version" 2>/dev/null || true
|
|
|
|
# Ensure [package].version exists: converting git=/tar= to path="source" removes
|
|
# the URL cookbook parsed the version from, so a recipe without an explicit
|
|
# [package].version fails packaging ("cannot guess version"). Add the branch
|
|
# version if missing (matches the vendored convention, e.g. brush = "0.3.1").
|
|
if grep -qE '^\[package\]' "$dir/recipe.toml" \
|
|
&& ! awk '/^\[package\]/{p=1;next} /^\[/{p=0} p' "$dir/recipe.toml" | grep -qE '^[[:space:]]*version[[:space:]]*='; then
|
|
python3 - "$dir/recipe.toml" <<'PY'
|
|
import re,sys
|
|
p=sys.argv[1]; s=open(p).read()
|
|
m=re.search(r'(\[package\][^\[]*?name\s*=\s*"[^"]*"\s*\n)', s)
|
|
if m: s=s[:m.end()]+'version = "0.3.1"\n'+s[m.end():]
|
|
else: s=re.sub(r'(\[package\]\s*\n)', r'\1version = "0.3.1"\n', s, count=1)
|
|
open(p,'w').write(s)
|
|
PY
|
|
fi
|
|
|
|
git -C "$ROOT" add -A "$dir" "$ROOT/.gitignore" >/dev/null 2>&1
|
|
nfiles=$(git -C "$ROOT" diff --cached --name-only -- "$dir/source" | wc -l | tr -d ' ')
|
|
echo "[$name] vendored: $nfiles source files staged, baked $(grep -rlI '__redox__\|Q_OS_REDOX' "$dir/source" 2>/dev/null|wc -l) redox-marked"
|
|
if [ "$COMMIT" = 1 ]; then
|
|
git -C "$ROOT" -c commit.gpgsign=false commit -q -m "$name: vendor as full-fork recipe (path=source, patches baked)" -- "$dir" "$ROOT/.gitignore"
|
|
echo "[$name] committed $(git -C "$ROOT" log -1 --format=%h)"
|
|
fi
|
|
done
|
|
rm -f "$ROOT/.vendor-fetch.log"
|
|
exit $rc
|