ACK/cmnt: [SRU][canonical-kernel-snaps/main][PATCH 1/1] nvidia-hooks: add vdpau to LD_PATH, put snap rev in sentinel

[Juerg Haefliger]

On Tue,  4 Mar 2025 10:35:55 +1100
Aaron Jauregui <aaron.jauregui at canonical.com> wrote:

> Putting missing reference to vdpau path in nvidia-user mangler, adding
> parent snap revision to nvidia-user sentinel to prevent locally
> installed components from not changing the sentinel file.

This double negation is confusing :-)


> 
> Signed-off-by: Aaron Jauregui <aaron.jauregui at canonical.com>
> ---
>  hooks/nvidia-user/install.nvidia-user              | 2 +-
>  hooks/nvidia-user/kernel-gpu-2404-provider-mangler | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hooks/nvidia-user/install.nvidia-user b/hooks/nvidia-user/install.nvidia-user
> index e58769a..7ad383e 100755
> --- a/hooks/nvidia-user/install.nvidia-user
> +++ b/hooks/nvidia-user/install.nvidia-user
> @@ -15,4 +15,4 @@ cp -r "$SNAP_COMPONENT"/usr "$SNAP_COMMON"/kernel-gpu-2404
>  cp "$SNAP_COMPONENT"/kernel-gpu-2404-provider-mangler "$SNAP_COMMON"/kernel-gpu-2404
>  
>  # put version information into sentinel file
> -echo "$SNAP_COMPONENT_REVISION" > "$SENTINEL_FILE"
> +echo "$SNAP_REVISION $SNAP_COMPONENT_REVISION" > "$SENTINEL_FILE"

Is the content of this file used anywhere? Or is this just for keeping track
of state for debugging or something?


> diff --git a/hooks/nvidia-user/kernel-gpu-2404-provider-mangler b/hooks/nvidia-user/kernel-gpu-2404-provider-mangler
> index f80cf93..c7e7b48 100755
> --- a/hooks/nvidia-user/kernel-gpu-2404-provider-mangler
> +++ b/hooks/nvidia-user/kernel-gpu-2404-provider-mangler
> @@ -4,7 +4,7 @@
>  ARCH_TRIPLET="$(uname -m)-linux-gnu"
>  
>  export OCL_ICD_VENDORS=${OCL_ICD_VENDORS:+$OCL_ICD_VENDORS:}${COMPONENT_PATH}/etc/OpenCL/vendors
> -export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${COMPONENT_PATH}/usr/lib/${ARCH_TRIPLET}
> +export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}${COMPONENT_PATH}/usr/lib/${ARCH_TRIPLET}:${COMPONENT_PATH}/usr/lib/${ARCH_TRIPLET}/vdpau
>  export __EGL_VENDOR_LIBRARY_DIRS=${__EGL_VENDOR_LIBRARY_DIRS:+$__EGL_VENDOR_LIBRARY_DIRS:}${COMPONENT_PATH}/usr/share/glvnd/egl_vendor.d
>  export __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS=${__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:+$__EGL_EXTERNAL_PLATFORM_CONFIG_DIRS:}${COMPONENT_PATH}/usr/share/egl/egl_external_platform.d
>  export VK_LAYER_PATH=${VK_LAYER_PATH:+$VK_LAYER_PATH:}${COMPONENT_PATH}/usr/share/vulkan/implicit_layer.d/

Acked-by: Juerg Haefliger <juerg.haefliger at canonical.com>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20250325/853523a7/attachment.sig>