From cda44b6c69d6f05a87e12f5ad8c272c9b2cdbe81 Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sat, 19 Sep 2020 09:49:47 +0200
Subject: [PATCH] fix(build_multi_image): Use objcopy instead of tr hack
The tr hack we used so far has been painful. The amount of locale
environment variables we need to set is surely a telling sign of that ...
Replace this with objcopy which can do the same thing, but much easier
and without locale related side effects ;)
Signed-off-by: Rahix <rahix@rahix.de>
---
bootloader/build_multi_image.sh | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bootloader/build_multi_image.sh b/bootloader/build_multi_image.sh
index b584dfcc5..ac918e118 100755
--- a/bootloader/build_multi_image.sh
+++ b/bootloader/build_multi_image.sh
@@ -6,8 +6,7 @@ BIN1="$2"
BIN2="$3"
BINOUT="$4"
-dd if=/dev/zero ibs=1k count=448 2>/dev/null | LANG=C LC_CTYPE=C LC_ALL=C LC_COLLATE=C tr "\000" "\377" > "$BINOUT"
-dd if="$BIN1" of="$BINOUT" conv=notrunc 2>/dev/null
-dd if="$BIN2" >> "$BINOUT" 2>/dev/null
+objcopy -I binary -O binary --pad-to=458752 --gap-fill=255 "${BIN1}" "$BINOUT"
+cat "$BIN2" >>"$BINOUT"
"$PYTHON" "$(dirname "$0")/crc_patch.py" "$BINOUT"
--
GitLab