Do not build updater when using QEMU model
This commit is contained in:
@ -9,9 +9,9 @@ then
|
|||||||
fi
|
fi
|
||||||
MODEL="$1"
|
MODEL="$1"
|
||||||
|
|
||||||
if [ ! -d "models/$1" ]
|
if [ ! -d "models/${MODEL}" ]
|
||||||
then
|
then
|
||||||
echo "model '$1' not found" >&2
|
echo "model '${MODEL}' not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
MODEL_DIR="$(realpath "models/${MODEL}")"
|
MODEL_DIR="$(realpath "models/${MODEL}")"
|
||||||
@ -62,21 +62,24 @@ FIRMWARE_OPEN_UEFIPAYLOAD="${UEFIPAYLOAD}" \
|
|||||||
"${MODEL_DIR}/coreboot.config" \
|
"${MODEL_DIR}/coreboot.config" \
|
||||||
"${COREBOOT}"
|
"${COREBOOT}"
|
||||||
|
|
||||||
# Rebuild firmware-update
|
if [ "${MODEL}" != "qemu" ]
|
||||||
SHASUM="$(sha384sum "${COREBOOT}" | cut -d " " -f 1)"
|
|
||||||
export BASEDIR="system76-${SHASUM}"
|
|
||||||
pushd apps/firmware-update >/dev/null
|
|
||||||
rm -rf "build/x86_64-efi-pe"
|
|
||||||
make "build/x86_64-efi-pe/boot.img"
|
|
||||||
cp -v "build/x86_64-efi-pe/boot.img" "${USB}.partial"
|
|
||||||
popd >/dev/null
|
|
||||||
|
|
||||||
# Copy firmware to USB image
|
|
||||||
mmd -i "${USB}.partial@@1M" "::${BASEDIR}/firmware"
|
|
||||||
mcopy -i "${USB}.partial@@1M" "${COREBOOT}" "::${BASEDIR}/firmware/firmware.rom"
|
|
||||||
if [ -e "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/uecflash.efi" ]
|
|
||||||
then
|
then
|
||||||
mcopy -i "${USB}.partial@@1M" "${MODEL_DIR}/ec.rom" "::${BASEDIR}/firmware/ec.rom"
|
# Rebuild firmware-update
|
||||||
mcopy -i "${USB}.partial@@1M" "${MODEL_DIR}/uecflash.efi" "::${BASEDIR}/firmware/uecflash.efi"
|
SHASUM="$(sha384sum "${COREBOOT}" | cut -d " " -f 1)"
|
||||||
|
export BASEDIR="system76-${SHASUM}"
|
||||||
|
pushd apps/firmware-update >/dev/null
|
||||||
|
rm -rf "build/x86_64-efi-pe"
|
||||||
|
make "build/x86_64-efi-pe/boot.img"
|
||||||
|
cp -v "build/x86_64-efi-pe/boot.img" "${USB}.partial"
|
||||||
|
popd >/dev/null
|
||||||
|
|
||||||
|
# Copy firmware to USB image
|
||||||
|
mmd -i "${USB}.partial@@1M" "::${BASEDIR}/firmware"
|
||||||
|
mcopy -i "${USB}.partial@@1M" "${COREBOOT}" "::${BASEDIR}/firmware/firmware.rom"
|
||||||
|
if [ -e "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/uecflash.efi" ]
|
||||||
|
then
|
||||||
|
mcopy -i "${USB}.partial@@1M" "${MODEL_DIR}/ec.rom" "::${BASEDIR}/firmware/ec.rom"
|
||||||
|
mcopy -i "${USB}.partial@@1M" "${MODEL_DIR}/uecflash.efi" "::${BASEDIR}/firmware/uecflash.efi"
|
||||||
|
fi
|
||||||
|
mv -v "${USB}.partial" "${USB}"
|
||||||
fi
|
fi
|
||||||
mv -v "${USB}.partial" "${USB}"
|
|
||||||
|
Reference in New Issue
Block a user