From: Petr Štetiar <ynezz@true.cz>
Date: Sat, 27 Jul 2019 05:47:10 +0000 (+0200)
Subject: scripts/ubinize-image.sh: fix buildbot breakage
X-Git-Tag: v18.06.5~4
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f024b4c83d122ee460251a3078e9dca2e8d599ad;p=oweals%2Fopenwrt.git

scripts/ubinize-image.sh: fix buildbot breakage

New Docker based buildslaves install just bare minimum of packages, thus
not having bsdmainutils package installed which provides `hexdump`
utility, leading to the following build breakage on buildbots:

 ubinize-image.sh: 12: /builder/scripts/ubinize-image.sh: hexdump: not found

So this patch simply replaces `hexdump` with `od` utility provided by
coreutils package, which should be likely available.

Co-authored-by: Yousong Zhou <yszhou4tech@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit c6d41c320c795b0bb9a9350c7d4b1ce55f25769a)
---

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 09a00b1898..a18d6dc428 100755
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -9,7 +9,7 @@ outfile=""
 err=""
 
 get_magic_word() {
-	dd if=$1 bs=2 count=1 2>/dev/null | hexdump -v -n 2 -e '1/1 "%02x"'
+	dd if=$1 bs=2 count=1 2>/dev/null | od -A n -N 2 -t x1 | tr -d ' '
 }
 
 is_ubifs() {