Skip to contentSkip to conversation

package/rpi-firmware: fix unmet dependencies

PATCH New Yann E. MORIN 3 participants 3 messages May 6, 2017 – May 7, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/rpi-firmware: fix unmet dependencies

Currently, vcdbg is only supported in 32-bit mode. Furthermore, vcdbg needs rpi-userland, which we currently only support in 32-bit mode.

Add a dependency on BR2_arm.

Cc Maxime Hadjinlian <[email protected]>
---
 package/rpi-firmware/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/rpi-firmware/Config.in +2 -0
index 4efef8691e..a7fa1c3b33 100644
@@ -67,6 +67,7 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	bool "vcdbg"
+	depends on BR2_arm # rpi-userland
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
 	select BR2_PACKAGE_RPI_USERLAND
@@ -74,6 +75,7 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	  Install vcdbg, to help debug communication with the GPU.
 
 comment "vcdbg needs a glibc toolchain w/ C++"
+	depends on BR2_arm
 	depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP
 
 endif # BR2_PACKAGE_RPI_FIRMWARE
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/rpi-firmware: fix unmet dependencies

Hello,

Quoted 10 lines · Yann E. MORIN

Currently, vcdbg is only supported in 32-bit mode. Furthermore, vcdbg needs rpi-userland, which we currently only support in 32-bit mode.

Add a dependency on BR2_arm.

Cc Maxime Hadjinlian <[email protected]>
---
 package/rpi-firmware/Config.in | 2 ++
 1 file changed, 2 insertions(+)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 package/rpi-firmware: fix unmet dependencies

In reply to Yann E. MORIN
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

Currently, vcdbg is only supported in 32-bit mode. Furthermore, vcdbg needs rpi-userland, which we currently only support in 32-bit mode.

Add a dependency on BR2_arm.

Cc Maxime Hadjinlian <[email protected]>

I was wondering if these were just missing when the || BR2_aarch64 logic was added, but rpi-userland really doesn't build in 64bit mode:

/home/peko/source/buildroot/output-rpi64/build/rpi-userland-f0642e3b58d8a140a3f7621630c15fbfa794b19d/build/inc/interface/vcos/vcos_assert.h:303:69: error: size of array ?vcos_static_assert? is negative

 #define vcos_static_assert(cond) __attribute__((unused)) extern int vcos_static_assert[(cond)?1:-1]
                                                                     ^

/home/peko/source/buildroot/output-rpi64/build/rpi-userland-f0642e3b58d8a140a3f7621630c15fbfa794b19d/interface/khronos/common/khrn_client_check_types.h:72:1: note: in expansion of macro ?vcos_static_assert?
vcos_static_assert(sizeof(GLsizeiptr) == 4);

Quoted 9 lines
---
 package/rpi-firmware/Config.in | 2 ++
 1 file changed, 2 insertions(+)
package/rpi-firmware/Config.in +0 -0
index 4efef8691e..a7fa1c3b33 100644

package/rpi-firmware/Config.in config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS · line 73

Quoted 7 lines
package/rpi-firmware/Config.in +1 -0
@@ -67,6 +67,7 @@ config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS
 
 config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG
 	bool "vcdbg"
+	depends on BR2_arm # rpi-userland
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_INSTALL_LIBSTDCPP # rpi-userland
 	select BR2_PACKAGE_RPI_USERLAND

What is even more important than the rpi-userland dependency is the fact that vcdgb is a prebuilt arm binary. You could argue that it perhaps should have used 'depends on' instead of 'select' for rpi-userland, as the dependency afaik is:

It doesn't make sense to debug the GPU communication if you don't use the GPU driver.

Rather than any strong direct rpi-userland dependency by this binary, but ok.

Committed after adjusting the comment, thanks.

Signature · 1 line
Bye, Peter Korsgaard