[Buildroot] [PATCH 1/1] package/nvidia-driver: fix build without X.org drivers

[Buildroot] [PATCH 1/1] package/nvidia-driver: fix build without X.org drivers

[Fabrice Fontaine]

Fix the following build failure without BR2_PACKAGE_NVIDIA_DRIVER_XORG
raised since commit 9cda982855315d683d4880e6bb2a129133ea7213:

ln: failed to create symbolic link '/tmp/instance-0/output-1/target/usr/lib/xorg/modules/extensions/libglx.so': No such file or directory

Fixes:
 - http://autobuild.buildroot.org/results/c2e7a826c105363309f70a3fcfe28bd53efcb94a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/nvidia-driver/nvidia-driver.mk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
index 7e89c1ab01..54c2aa46d8 100644
--- a/package/nvidia-driver/nvidia-driver.mk
+++ b/package/nvidia-driver/nvidia-driver.mk
@@ -96,6 +96,12 @@ NVIDIA_DRIVER_LIBS += \
 	nvidia_drv.so:xorg/modules/drivers/ \
 	libglx.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/
 
+# libglx needs a symlink according to the driver README. It has no SONAME
+define NVIDIA_DRIVER_SYMLINK_LIBGLX
+	ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
+		$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
+endef
+
 endif # X drivers
 
 ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y)
@@ -187,12 +193,6 @@ define NVIDIA_DRIVER_INSTALL_STAGING_CMDS
 	$(NVIDIA_DRIVER_INSTALL_GL_DEV)
 endef
 
-# libglx needs a symlink according to the driver README. It has no SONAME
-define NVIDIA_DRIVER_SYMLINK_LIBGLX
-	ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
-		$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
-endef
-
 # For target, install libraries and X.org modules
 define NVIDIA_DRIVER_INSTALL_TARGET_CMDS
 	$(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR))
-- 
2.30.2

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/nvidia-driver: fix build without X.org drivers

[Vincent Fazio]

[-- Attachment #1.1: Type: text/plain, Size: 2291 bytes --]

Sorry about that. Apparently I did make those changes in our branch but 
forgot to fold them into a v2 for the submitted patch.

The only other change I'd recommend is moving the finalize hook inside 
the same block, since it doesn't apply if the X drivers aren't being 
included. More for logic's sake than anything.

Reviewed-by: Vincent Fazio <vfazio@xes-inc.com>

On 8/19/21 12:21 PM, Fabrice Fontaine wrote:
> Fix the following build failure without BR2_PACKAGE_NVIDIA_DRIVER_XORG
> raised since commit 9cda982855315d683d4880e6bb2a129133ea7213:
>
> ln: failed to create symbolic link '/tmp/instance-0/output-1/target/usr/lib/xorg/modules/extensions/libglx.so': No such file or directory
>
> Fixes:
>   - http://autobuild.buildroot.org/results/c2e7a826c105363309f70a3fcfe28bd53efcb94a
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>   package/nvidia-driver/nvidia-driver.mk | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
> index 7e89c1ab01..54c2aa46d8 100644
> --- a/package/nvidia-driver/nvidia-driver.mk
> +++ b/package/nvidia-driver/nvidia-driver.mk
> @@ -96,6 +96,12 @@ NVIDIA_DRIVER_LIBS += \
>   	nvidia_drv.so:xorg/modules/drivers/ \
>   	libglx.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/
>   
> +# libglx needs a symlink according to the driver README. It has no SONAME
> +define NVIDIA_DRIVER_SYMLINK_LIBGLX
> +	ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
> +		$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
> +endef
> +
>   endif # X drivers
>   
>   ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y)
> @@ -187,12 +193,6 @@ define NVIDIA_DRIVER_INSTALL_STAGING_CMDS
>   	$(NVIDIA_DRIVER_INSTALL_GL_DEV)
>   endef
>   
> -# libglx needs a symlink according to the driver README. It has no SONAME
> -define NVIDIA_DRIVER_SYMLINK_LIBGLX
> -	ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
> -		$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
> -endef
> -
>   # For target, install libraries and X.org modules
>   define NVIDIA_DRIVER_INSTALL_TARGET_CMDS
>   	$(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR))

-- 
Vincent Fazio
Embedded Software Engineer - ATS
Extreme Engineering Solutions, Inc
http://www.xes-inc.com


[-- Attachment #1.2: Type: text/html, Size: 3190 bytes --]

[-- Attachment #2: Type: text/plain, Size: 145 bytes --]

_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/nvidia-driver: fix build without X.org drivers

[Yann E. MORIN]

Fabrice, All,

On 2021-08-19 19:21 +0200, Fabrice Fontaine spake thusly:
> Fix the following build failure without BR2_PACKAGE_NVIDIA_DRIVER_XORG
> raised since commit 9cda982855315d683d4880e6bb2a129133ea7213:
> 
> ln: failed to create symbolic link '/tmp/instance-0/output-1/target/usr/lib/xorg/modules/extensions/libglx.so': No such file or directory
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/c2e7a826c105363309f70a3fcfe28bd53efcb94a
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/nvidia-driver/nvidia-driver.mk | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/package/nvidia-driver/nvidia-driver.mk b/package/nvidia-driver/nvidia-driver.mk
> index 7e89c1ab01..54c2aa46d8 100644
> --- a/package/nvidia-driver/nvidia-driver.mk
> +++ b/package/nvidia-driver/nvidia-driver.mk
> @@ -96,6 +96,12 @@ NVIDIA_DRIVER_LIBS += \
>  	nvidia_drv.so:xorg/modules/drivers/ \
>  	libglx.so.$(NVIDIA_DRIVER_VERSION):xorg/modules/extensions/
>  
> +# libglx needs a symlink according to the driver README. It has no SONAME
> +define NVIDIA_DRIVER_SYMLINK_LIBGLX
> +	ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
> +		$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
> +endef
> +
>  endif # X drivers
>  
>  ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y)
> @@ -187,12 +193,6 @@ define NVIDIA_DRIVER_INSTALL_STAGING_CMDS
>  	$(NVIDIA_DRIVER_INSTALL_GL_DEV)
>  endef
>  
> -# libglx needs a symlink according to the driver README. It has no SONAME
> -define NVIDIA_DRIVER_SYMLINK_LIBGLX
> -	ln -sf libglx.so.$(NVIDIA_DRIVER_VERSION) \
> -		$(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so
> -endef
> -
>  # For target, install libraries and X.org modules
>  define NVIDIA_DRIVER_INSTALL_TARGET_CMDS
>  	$(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR))
> -- 
> 2.30.2
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot