diff options
| author | Robert Marko | 2026-01-12 16:33:02 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-01-18 10:21:27 +0000 |
| commit | 2210c6e632ea0c4cf9d08cbd4496261661f70581 (patch) | |
| tree | c5050ecae0d194744a34f2545a331d6216e2d060 | |
| parent | 111151379d498cb544b34a34fd0fde37f6ea5b19 (diff) | |
| download | openwrt-2210c6e632ea0c4cf9d08cbd4496261661f70581.tar.gz | |
boot: arm-trusted-firmware-microchipsw: depend on host Ruby
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>
(cherry picked from commit 082fe669f7b6839144484589ebb72c87bb9d6314)
| -rw-r--r-- | package/boot/arm-trusted-firmware-microchipsw/Makefile | 1 | ||||
| -rw-r--r-- | package/boot/arm-trusted-firmware-microchipsw/patches/0004-microchip-lan969x-do-not-rely-on-Ruby-shebang.patch | 29 |
2 files changed, 30 insertions, 0 deletions
diff --git a/package/boot/arm-trusted-firmware-microchipsw/Makefile b/package/boot/arm-trusted-firmware-microchipsw/Makefile index e4ec3851d6..8b40df9d53 100644 --- a/package/boot/arm-trusted-firmware-microchipsw/Makefile +++ b/package/boot/arm-trusted-firmware-microchipsw/Makefile @@ -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 index 0000000000..10448f21e2 --- /dev/null +++ b/package/boot/arm-trusted-firmware-microchipsw/patches/0004-microchip-lan969x-do-not-rely-on-Ruby-shebang.patch @@ -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} |