Skip to content

the eeprom binary was renamed so that we can use self update in non s… #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ycardaillac wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

the eeprom binary was renamed so that we can use self update in non s… #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions classes/image-sign-rpi.bbclass
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ do_balena_signed_bootgen_and_deploy() {
bbnote "Skipping ${f}"
continue
fi
# keep a copy of the firmware in boot.img for EEPROM self-update
if echo "${fname}" | grep -q -E "pieeprom.*\.bin$"; then
cp -vf "${f}" "${dname}/pieeprom.upd"
elif echo "${fname}" | grep -q -E "pieeprom.*\.sig$"; then
cp -vf "${f}" "${dname}/pieeprom.sig"
fi
cp -rvf "${f}" "${tmpdir}/"
rm -rf "${f:?}"
# remove directory only once it is empty
Expand Down
8 changes: 4 additions & 4 deletions recipes-bsp/rpi-eeprom/rpi-eeprom_git.bbappend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ do_compile:append() {

# Merge the configuration file into the firmware
${PYTHON} "${WORKDIR}/rpi-eeprom-config" --config "${boot_conf}" --digest "${boot_conf}.sig" \
--out "${WORKDIR}/${tgt_eeprom_bin}" --pubkey "${DEPLOY_DIR_IMAGE}/balena-keys/rsa.pem" "${WORKDIR}/${src_eeprom_bin}"
--out "${WORKDIR}/${TGT_EEPROM_BIN}" --pubkey "${DEPLOY_DIR_IMAGE}/balena-keys/rsa.pem" "${WORKDIR}/${src_eeprom_bin}"

# Sign the firmware
do_sign_rsa "${WORKDIR}/${tgt_eeprom_bin}" "${WORKDIR}/${tgt_eeprom_bin%.bin}.sig"
do_sign_rsa "${WORKDIR}/${TGT_EEPROM_BIN}" "${WORKDIR}/${TGT_EEPROM_SIG}"
fi
}

Expand All @@ -56,7 +56,7 @@ do_deploy:append() {
echo "program_pubkey=1" >> ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/config.txt
echo "revoke_devkey=1" >> ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/config.txt
echo "program_jtag_lock=1" >> ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/config.txt
cp -av ${WORKDIR}/pieeprom-latest-stable*bin ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/pieeprom.bin
cp -av ${WORKDIR}/pieeprom-latest-stable*sig ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/pieeprom.sig
cp -av ${WORKDIR}/${TGT_EEPROM_BIN} ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/pieeprom.bin
cp -av ${WORKDIR}/${TGT_EEPROM_SIG} ${DEPLOY_DIR_IMAGE}/rpi-eeprom/secure-boot-lock/pieeprom.sig
fi
}
2 changes: 0 additions & 2 deletions recipes-core/images/balena-image-sb.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ BALENA_BOOT_PARTITION_FILES:append = " \
balena-bootloader/bootenv:/bootenv \
"

BALENA_BOOT_PARTITION_FILES:append = "${@oe.utils.conditional('SIGN_API','','',' rpi-eeprom/pieeprom-latest-stable.sig:/pieeprom-latest-stable.sig',d)}"

IMAGE_INSTALL:remove = " u-boot"
IMAGE_INSTALL:append = " grub-editenv"

Expand Down