diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2022-08-15 08:38:53 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2022-08-16 08:34:06 +0200 |
commit | 81f0511d0fde5ac917fb322f2ad2184b3b033eec (patch) | |
tree | e0a90982a79d4d2c79ce2cb555b9dafccefef369 | |
parent | fce0d30e07df009edb2aceace22a490a04a5a2c9 (diff) | |
download | barebox-81f0511d0fde5ac917fb322f2ad2184b3b033eec.tar.gz barebox-81f0511d0fde5ac917fb322f2ad2184b3b033eec.tar.xz |
ARM: i.MX8M: HABv4: make barebox SHA256 embedding POSIX-shell compatible
C-Style printf "\xHH" is not supported by a POSIX shell,
while printf "\oOOO" is. As we use printf "\xHH" for converting the
textual output of sha256sum into binary, systems using dash as shell
will end up embedding literal \xHH characters in the output resulting in
an ubootable barebox when CONFIG_PBL_VERIFY_PIGGY=y:
!hash mismatch, refusing to decompress
Fix this by using octal escape sequences instead.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Reviewed-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Link: https://lore.barebox.org/20220815063853.672239-1-a.fatoum@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | images/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile index c79f1a272e..7a8bb94fe0 100644 --- a/images/Makefile +++ b/images/Makefile @@ -113,7 +113,8 @@ $(obj)/piggy.o: $(obj)/barebox.z FORCE $(obj)/sha_sum.o: $(obj)/barebox.sha.bin FORCE quiet_cmd_sha256bin ?= SHA-BIN $@ - cmd_sha256bin ?= printf "$(shell awk '{printf $$1}' < $(obj)/barebox.sum | sed -e 's/../\\x&/g' )" > $@ + cmd_sha256bin = printf "$(shell sed 's/ .*$$//;s/../0x&\n/g;s/\n$$//' $(obj)/barebox.sum | \ + while read -r byte; do printf '\%o' $$byte; done)" > $@ quiet_cmd_sha256sum ?= SHA $@ cmd_sha256sum ?= sha256sum $(obj)/barebox.z > $@ |