Relentnet/MarineComOS_RPI
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Create WORK_DIR earlier

Browse Source 
The exit trap uses the log function which writes to a log file in WORK_DIR.
This commit is contained in:
Serge Schneider 2024-10-29 15:15:06 +00:00
parent b8e497cf21
commit 2aa7133eea
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
build.sh
View File

@ -123,6 +123,20 @@ run_stage(){
log "End ${STAGE_DIR}" log "End ${STAGE_DIR}"
} }
term() {
if [ "$?" -ne 0 ]; then
log "Build failed"
else
log "Build finished"
fi
unmount "${STAGE_WORK_DIR}"
if [ "$STAGE" = "export-image" ]; then
for img in "${STAGE_WORK_DIR}/"*.img; do
unmount_image "$img"
done
fi
}
if [ "$(id -u)" != "0" ]; then if [ "$(id -u)" != "0" ]; then
echo "Please run as root" 1>&2 echo "Please run as root" 1>&2
exit 1 exit 1
@ -157,22 +171,6 @@ do
esac esac
done done
term() {
if [ "$?" -ne 0 ]; then
log "Build failed"
else
log "Build finished"
fi
unmount "${STAGE_WORK_DIR}"
if [ "$STAGE" = "export-image" ]; then
for img in "${STAGE_WORK_DIR}/"*.img; do
unmount_image "$img"
done
fi
}
trap term EXIT INT TERM
export PI_GEN=${PI_GEN:-pi-gen} export PI_GEN=${PI_GEN:-pi-gen}
export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen} export PI_GEN_REPO=${PI_GEN_REPO:-https://github.com/RPi-Distro/pi-gen}
export PI_GEN_RELEASE=${PI_GEN_RELEASE:-Raspberry Pi reference} export PI_GEN_RELEASE=${PI_GEN_RELEASE:-Raspberry Pi reference}
@ -252,6 +250,9 @@ if [ "$SETFCAP" != "1" ]; then
export CAPSH_ARG="--drop=cap_setfcap" export CAPSH_ARG="--drop=cap_setfcap"
fi fi
mkdir -p "${WORK_DIR}"
trap term EXIT INT TERM
dependencies_check "${BASE_DIR}/depends" dependencies_check "${BASE_DIR}/depends"
echo "Checking native $ARCH executable support..." echo "Checking native $ARCH executable support..."
@ -295,7 +296,6 @@ if [[ "${PUBKEY_ONLY_SSH}" = "1" && -z "${PUBKEY_SSH_FIRST_USER}" ]]; then
exit 1 exit 1
fi fi
mkdir -p "${WORK_DIR}"
log "Begin ${BASE_DIR}" log "Begin ${BASE_DIR}"
STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*} STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*}