mirror of
https://github.com/BetterCorp/BetterFrame.git
synced 2026-05-26 16:56:33 +00:00
fix(pi-gen): resolve files/ from sub-stage dir, not BASE_DIR
\${BASE_DIR} is pi-gen's own checkout (/pi-gen), not the path of the
custom stage. Resolve files/ relative to the script's own location.
This commit is contained in:
parent
04d40adb93
commit
4e652c6fd1
1 changed files with 7 additions and 6 deletions
|
|
@ -1,8 +1,9 @@
|
|||
#!/bin/bash -e
|
||||
# Host-side (runs outside chroot, before 01-run-chroot.sh). Stages every
|
||||
# file from the sub-stage's files/ dir into the chroot at /tmp/bf-files
|
||||
# so the chroot script can install them. Files dir is populated by CI
|
||||
# (build.yml's "Stage files for pi-gen" step).
|
||||
# Host-side (runs outside chroot, before 01-run-chroot.sh). Pi-gen sets
|
||||
# cwd to the sub-stage directory and exposes ROOTFS_DIR. Bulk-copy this
|
||||
# sub-stage's files/ into the chroot at /tmp/bf-files so 01-run-chroot.sh
|
||||
# can install them. files/ is populated by CI (build.yml's "Stage files
|
||||
# for pi-gen" step).
|
||||
SUB_STAGE_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
install -d "${ROOTFS_DIR}/tmp/bf-files"
|
||||
cp -r "${BASE_DIR}/stage-betterframe-client/01-install-kiosk/files/." \
|
||||
"${ROOTFS_DIR}/tmp/bf-files/"
|
||||
cp -r "${SUB_STAGE_DIR}/files/." "${ROOTFS_DIR}/tmp/bf-files/"
|
||||
|
|
|
|||
Loading…
Reference in a new issue