Skip to content

Commit f774667

Browse files
bong-water-water-bongclaude
andcommitted
review: keep the scrubbed pin names, derive the manifest path, wrap a comment
Rebased onto main (0d0c846) and reviewed against the current packaging, image and release check (#556, #563, #569): - docs/releases.md conflicted on the pins table and the NPU paragraph: the branch put the private repositories' names back into a public file ("gpu-kernels (private, HIP)", "npu-kernels (private, signed)", "npu-runtime (private)"), which main had scrubbed. Resolved keeping main's wording ("private kernel add-on (HIP)", "private NPU kernel set (signed)", "private NPU runtime") and the new shape. - scripts/weekly.sh package_checks: the set's manifest is now derived from `rel` once, instead of rebuilding the path with `${f%/npu/kernels/*}` plus `cut` (which can leave a double slash). Checked that the derived path resolves for <pkg>/npu/kernels/<set>/<id>/layer1.elf. - os/mini/init.sh: comment wrapped. Not marked ready: the package stage stages nothing against the pins in this tree (see the PR comment). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
1 parent 1e727e0 commit f774667

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎os/mini/init.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ else
9494
say "[engine] no /data/1bit-llama: '1bit serve' has no HRX llama-server on this boot"
9595
fi
9696

97-
# The NPU kernels (each with its signed manifest) live on the stick (they used to be inside the RAM image, which made it too big
98-
# to load): link them to the path the engine looks for, beside itself.
97+
# The NPU kernels (each with its signed manifest) live on the stick - inside the RAM image they made it too
98+
# big to load - and are linked to the path the engine looks for, beside itself.
9999
if [ -d /data/npu/kernels ] && [ -d /home ]; then
100100
mkdir -p /home/bcloud/wt/npupkg-build/npu 2>/dev/null
101101
ln -sfn /data/npu/kernels /home/bcloud/wt/npupkg-build/npu/kernels 2>/dev/null

‎scripts/weekly.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,15 @@ package_checks() { # package_checks <linux tarball>
341341
fi
342342
while IFS= read -r -d '' f; do
343343
rel=${f#"$t"/}
344-
setdir=${f%/npu/kernels/*}/npu/kernels/$(echo "${rel#*/npu/kernels/}" | cut -d/ -f1)
345344
case "$(basename "$f")" in
346345
manifest|manifest.sig) continue ;;
347346
esac
347+
# <pkg>/npu/kernels/<set>/<id>/layer1.elf -> the set's manifest, without rebuilding the path by hand
348+
manifest=$t/${rel%/npu/kernels/*}/npu/kernels/${rel#*/npu/kernels/}
349+
manifest=${manifest%/*/*}/manifest
348350
if [[ "$rel" =~ ^[^/]+/npu/kernels/[^/]+/([0-9a-f]+/layer1\.elf)$ ]]; then
349351
inner=${BASH_REMATCH[1]}
350-
want=$(awk -v p="$inner" '$1=="file" && $4==p {print $2}' "$t/$setdir/manifest" 2>/dev/null)
352+
want=$(awk -v p="$inner" '$1=="file" && $4==p {print $2}' "$manifest" 2>/dev/null)
351353
if [ -z "$want" ]; then
352354
echo "FAIL $rel is not listed in its set's signed manifest"; nk=$((nk + 1))
353355
elif [ "$want" != "$(sha256sum "$f" | cut -d' ' -f1)" ]; then

0 commit comments

Comments
 (0)