]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
boot: arm-trusted-firmware-microchipsw: depend on host Ruby
authorRobert Marko <robert.marko@sartura.hr>
Mon, 12 Jan 2026 16:33:02 +0000 (17:33 +0100)
committerRobert Marko <robimarko@gmail.com>
Mon, 12 Jan 2026 17:01:17 +0000 (18:01 +0100)
Microchip ATF depends on Ruby scripts to generate the FWU monitor HTML
and more, so make sure that host Ruby is available.

We also need to call the scripts directly via Ruby executable as shebang
wont work due to lack of Ruby in the Buildbot container.

Fixes: 5205c0c42607 ("microchipsw: lan969x: add Microchip EV23X71A")
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
package/boot/arm-trusted-firmware-microchipsw/Makefile
package/boot/arm-trusted-firmware-microchipsw/patches/0004-microchip-lan969x-do-not-rely-on-Ruby-shebang.patch [new file with mode: 0644]

index e4ec3851d6f90da72754ec9f8ee9b79fca1ce4c0..8b40df9d53b978474e94bc39ba749deca0880f7e 100644 (file)
@@ -9,6 +9,7 @@ PKG_SOURCE_DATE:=2026-01-07
 PKG_SOURCE_VERSION:=7696c9aaaae7c677f4c373a61a1289cba7f824aa
 PKG_MIRROR_HASH:=331548d7c73896bd5e4438c0ec9c71bbe58d3bf9a29350496ad94c382e922b9c
 
+PKG_BUILD_DEPENDS:=ruby/host
 PKG_MAINTAINER:=Robert Marko <robert.marko@sartura.hr>
 
 include $(INCLUDE_DIR)/kernel.mk
diff --git a/package/boot/arm-trusted-firmware-microchipsw/patches/0004-microchip-lan969x-do-not-rely-on-Ruby-shebang.patch b/package/boot/arm-trusted-firmware-microchipsw/patches/0004-microchip-lan969x-do-not-rely-on-Ruby-shebang.patch
new file mode 100644 (file)
index 0000000..10448f2
--- /dev/null
@@ -0,0 +1,29 @@
+From f78f934710394822a36bd74043ed93a812c1c690 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robert.marko@sartura.hr>
+Date: Mon, 12 Jan 2026 15:36:35 +0100
+Subject: [PATCH] microchip: lan969x: do not rely on Ruby shebang
+
+Host Ruby build in the staging dir must be used, so we cannot rely on the
+shebang as that will fail.
+
+So, call the script via Ruby executable instead.
+
+Signed-off-by: Robert Marko <robert.marko@sartura.hr>
+---
+ plat/microchip/lan969x/common/common.mk | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/plat/microchip/lan969x/common/common.mk
++++ b/plat/microchip/lan969x/common/common.mk
+@@ -218,9 +218,9 @@ FWU_HTML := ${BUILD_PLAT}/fwu.html
+ FWU_JS   := ${BUILD_PLAT}/fwu_app.js
+ ${FWU_JS}: ${BUILD_PLAT}/${FWU_FIP_NAME}
+-      ./plat/microchip/scripts/mkjs.rb -p ${PLAT} -o ${FWU_JS} $<
++      $(Q)ruby ./plat/microchip/scripts/mkjs.rb -p ${PLAT} -o ${FWU_JS} $<
+ ${FWU_HTML}: ${FWU_JS}
+-      ./plat/microchip/scripts/html_inline.rb -i ${BUILD_PLAT} ./scripts/fwu/serial.html > ${FWU_HTML}
++      $(Q)ruby ./plat/microchip/scripts/html_inline.rb -i ${BUILD_PLAT} ./scripts/fwu/serial.html > ${FWU_HTML}
+ all: ${FWU_HTML}