From 14303b2522d653bd475b2dffe965ef8c80f4a008 Mon Sep 17 00:00:00 2001 From: zuevav Date: Wed, 23 Sep 2026 16:28:37 +0300 Subject: [PATCH] =?UTF-8?q?build-iso:=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D1=8F=D0=B4=D1=80=D0=B0?= =?UTF-8?q?=20=E2=80=94=20=D0=B8=D0=B7=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8?= =?UTF-8?q?=D1=81=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=84=D0=B5=D1=81=D1=82=D0=B0=20(payload),=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BE?= =?UTF-8?q?=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Fable 5.1 Claude-Session: https://claude.ai/code/session_01Q4YVo4UMopqT5DzicqpPjL --- deploy/iso/build-iso.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deploy/iso/build-iso.sh b/deploy/iso/build-iso.sh index 6d69a26..6f6cadf 100755 --- a/deploy/iso/build-iso.sh +++ b/deploy/iso/build-iso.sh @@ -34,8 +34,11 @@ cp "$HERE/../systemd/bj-welcome.service" "$HERE/../systemd/bj-welcome.timer" "$W if [ -n "$BUNDLE" ]; then [ -s "$BUNDLE/manifest.json" ] || { echo "в $BUNDLE нет manifest.json"; exit 1; } mkdir -p "$WORK/bj/bundle"; cp "$BUNDLE/manifest.json" "$WORK/bj/bundle/" - for f in $(python3 -c 'import json,sys;m=json.load(open(sys.argv[1]));m=m.get("manifest",m);print(" ".join(a["file"] for a in m["artifacts"] if a["name"] in ("bj-server","bj-component-install")))' "$BUNDLE/manifest.json"); do - cp "$BUNDLE/$f" "$WORK/bj/bundle/" + # манифест подписан: тело — base64 в поле payload + FILES=$(python3 -c 'import json,sys,base64;s=json.load(open(sys.argv[1]));m=json.loads(base64.b64decode(s["payload"]));print(" ".join(a["file"] for a in m["artifacts"] if a["name"] in ("bj-server","bj-component-install")))' "$BUNDLE/manifest.json") || { echo "не удалось прочитать манифест релиза"; exit 1; } + [ -n "$FILES" ] || { echo "в релизе нет компонентов ядра (bj-server, bj-component-install)"; exit 1; } + for f in $FILES; do + cp "$BUNDLE/$f" "$WORK/bj/bundle/" || exit 1 done echo "в образ добавлено ядро bj: $(ls "$WORK/bj/bundle" | tr '\n' ' ')" fi