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 <kory.maincent@bootlin.com> Reviewed-by: Bryce Schober <bryce.schober@gmail.com> Tested-by: Bryce Schober <bryce.schober@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
e5a74af215
commit
c06bed7296
|
@ -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.
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue