From: Marcin Maj Date: Thu, 4 Dec 2025 00:43:41 +0000 (+0100) Subject: ath79: fix platform check image mikrotik nor X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=3a10dd596760ecebe5d8a5f3804bfe1d13f952ae;p=openwrt%2Fstaging%2Fxback.git 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 Link: https://github.com/openwrt/openwrt/pull/21034 Signed-off-by: Robert Marko --- 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 629e7fd9b8..67e8d77175 100644 --- 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%%.*}"