From c06bed7296faaf856895dad4b6b20d0fb66fae39 Mon Sep 17 00:00:00 2001 From: Kory Maincent Date: Mon, 15 Nov 2021 15:46:20 +0100 Subject: [PATCH] package/rpi-firmware: update vcdbg runtime dependencies We used to select the rpi-userland to make the vcdbg tool work but it conflicts with the use of mesa. It implies we can not install vcdbg with mesa libraries but it is false. We could use the prebuilt libraries from the rpi-firmware sources to run vcdbg. This patch removes the select dependency of rpi-userland package and installs the prebuilt libraries needed by vcdbg only if rpi-userland is not selected. Signed-off-by: Kory Maincent Reviewed-by: Bryce Schober Tested-by: Bryce Schober Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/rpi-firmware/Config.in | 1 - package/rpi-firmware/rpi-firmware.mk | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/rpi-firmware/Config.in b/package/rpi-firmware/Config.in index f9fc0b0e5e..8070dc3019 100644 --- a/package/rpi-firmware/Config.in +++ b/package/rpi-firmware/Config.in @@ -98,7 +98,6 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG depends on BR2_arm # prebuilt arm binary, rpi-userland depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_INSTALL_LIBSTDCPP # rpi-userland - select BR2_PACKAGE_RPI_USERLAND help Install vcdbg, to help debug communication with the GPU. diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 5e8b0379ba..f773f83999 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -57,12 +57,23 @@ define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS endef endif +# Install prebuilt libraries if RPI_USERLAND not enabled +ifneq ($(BR2_PACKAGE_RPI_USERLAND),y) +define RPI_FIRMWARE_INSTALL_TARGET_LIB + $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libvcos.so \ + $(TARGET_DIR)/usr/lib/libvcos.so + $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libdebug_sym.so \ + $(TARGET_DIR)/usr/lib/libdebug_sym.so +endef +endif + ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG),y) define RPI_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -D -m 0700 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/bin/vcdbg \ $(TARGET_DIR)/usr/sbin/vcdbg $(INSTALL) -D -m 0644 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/lib/libelftoolchain.so \ $(TARGET_DIR)/usr/lib/libelftoolchain.so + $(RPI_FIRMWARE_INSTALL_TARGET_LIB) endef endif # INSTALL_VCDBG