* [Buildroot] [PATCH] package/rpi-firmware: update vcdbg runtime dependencies
@ 2021-11-15 14:46 Kory Maincent
2021-12-02 0:39 ` bryce.schober
2021-12-10 19:11 ` Arnout Vandecappelle
0 siblings, 2 replies; 3+ messages in thread
From: Kory Maincent @ 2021-11-15 14:46 UTC (permalink / raw)
To: buildroot; +Cc: mahyar.koshkouei, thomas.petazzoni, martin
We used to select the rpi-userland to make the vcdbg tool work but it
conflict 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>
---
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 f5a25c5680..d8bcc8ba96 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 d74f7155c7..743a259dc3 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -32,12 +32,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
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/rpi-firmware: update vcdbg runtime dependencies
2021-11-15 14:46 [Buildroot] [PATCH] package/rpi-firmware: update vcdbg runtime dependencies Kory Maincent
@ 2021-12-02 0:39 ` bryce.schober
2021-12-10 19:11 ` Arnout Vandecappelle
1 sibling, 0 replies; 3+ messages in thread
From: bryce.schober @ 2021-12-02 0:39 UTC (permalink / raw)
To: Kory Maincent; +Cc: martin, mahyar.koshkouei, Thomas Petazzoni, buildroot
[-- Attachment #1.1: Type: text/plain, Size: 2798 bytes --]
On Mon, Nov 15, 2021 at 6:46 AM Kory Maincent <kory.maincent@bootlin.com>
wrote:
>
> We used to select the rpi-userland to make the vcdbg tool work but it
> conflict 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>
> ---
> 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 f5a25c5680..d8bcc8ba96 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 d74f7155c7..743a259dc3 100644
> --- a/package/rpi-firmware/rpi-firmware.mk
> +++ b/package/rpi-firmware/rpi-firmware.mk
> @@ -32,12 +32,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
>
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
[-- Attachment #1.2: Type: text/html, Size: 3872 bytes --]
[-- Attachment #2: Type: text/plain, Size: 150 bytes --]
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH] package/rpi-firmware: update vcdbg runtime dependencies
2021-11-15 14:46 [Buildroot] [PATCH] package/rpi-firmware: update vcdbg runtime dependencies Kory Maincent
2021-12-02 0:39 ` bryce.schober
@ 2021-12-10 19:11 ` Arnout Vandecappelle
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2021-12-10 19:11 UTC (permalink / raw)
To: Kory Maincent, buildroot; +Cc: mahyar.koshkouei, thomas.petazzoni, martin
On 15/11/2021 15:46, Kory Maincent wrote:
> We used to select the rpi-userland to make the vcdbg tool work but it
> conflict 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>
Applied to master, thanks.
Regards,
Arnout
> ---
> 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 f5a25c5680..d8bcc8ba96 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 d74f7155c7..743a259dc3 100644
> --- a/package/rpi-firmware/rpi-firmware.mk
> +++ b/package/rpi-firmware/rpi-firmware.mk
> @@ -32,12 +32,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
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-10 19:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-15 14:46 [Buildroot] [PATCH] package/rpi-firmware: update vcdbg runtime dependencies Kory Maincent
2021-12-02 0:39 ` bryce.schober
2021-12-10 19:11 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.