ath79: fix platform check image mikrotik nor

Every attempt to update a device with NOR flash
and RouterBOOT v6 resulted in the error:
“RouterBOOT 6 and earlier requires ELF-in-YAFFS image.”
The cause was that xargs did not fully remove whitespace,
so the condition "$bootentry" != "kernel" always evaluated to true.

Signed-off-by: Marcin Maj <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/21034
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh b/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
index 629e7fd9b8b16fb5cab5ee4e021a8b01504026ad..67e8d771752800e5ca6da6eb0b2953d743cb7a88 100644 (file)
--- a/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ath79/mikrotik/base-files/lib/upgrade/platform.sh
@@ -6,7 +6,7 @@ REQUIRE_IMAGE_METADATA=1
 
 platform_check_image_mikrotik_nor() {
        local bootfwver bootfwmajor
-       local bootentry="$(dd bs=10 skip=1 count=1 if="$1" 2>/dev/null | xargs -0)"
+       local bootentry="$(dd bs=10 skip=1 count=1 if="$1" 2>/dev/null | xargs)"
 
        read -r bootfwver < /sys/firmware/mikrotik/hard_config/booter_version
        bootfwmajor="${bootfwver%%.*}"