[SRU][kernel-snaps-uc24.04/pc][PATCH 1/2] snapcraft.yaml: use -server libraries, rename 550 to 550-erd

[Aaron Jauregui]

Fix two libraries using the non-server nvidia libraries in user
component, rename 550 drivers to 550-erd to reduce ambiguity as to
wheter the component is for nvidia 550-server (erd) or non-server (uda).
This also opens up the possibility of implementing the uda driver in the
future as 550-uda for consistency.

Signed-off-by: Aaron Jauregui <aaron.jauregui at canonical.com>
---
 snapcraft.yaml | 56 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 8b37988..1d4c992 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -15,15 +15,15 @@ platforms:
   arm64:
 
 components:
-  nvidia-550-ko:
+  nvidia-550-erd-ko:
     type: kernel-modules
-    summary: Nvidia 550 kernel objects
-    description: Nvidia 550 driver kernel objects for the Ubuntu generic kernel snap
+    summary: Nvidia 550-server kernel objects
+    description: Nvidia 550-server driver kernel objects for the Ubuntu generic kernel snap
 
-  nvidia-550-user:
+  nvidia-550-erd-user:
     type: standard
-    summary: Nvidia 550 userspace libraries
-    description: Userspace libraries required by the Nvidia 550 driver for the Ubuntu generic kernel snap
+    summary: Nvidia 550-server userspace libraries
+    description: Userspace libraries required by the Nvidia 550-server driver for the Ubuntu generic kernel snap
 
   nouveau-ko:
     type: kernel-modules
@@ -112,7 +112,7 @@ parts:
     plugin: dump
     source: files
 
-  nvidia-550-ko-comp:
+  nvidia-550-erd-ko-comp:
     source: https://git.launchpad.net/canonical-kernel-snaps
     source-type: git
     source-branch: main
@@ -138,15 +138,15 @@ parts:
       mv hooks/nvidia-ko/* "$CRAFT_PART_INSTALL"
 
     organize:
-      bits/: (component/nvidia-550-ko)/bits
-      usr/bin: (component/nvidia-550-ko)/bin
-      usr/lib: (component/nvidia-550-ko)/lib
+      bits/: (component/nvidia-550-erd-ko)/bits
+      usr/bin: (component/nvidia-550-erd-ko)/bin
+      usr/lib: (component/nvidia-550-erd-ko)/lib
 
-      install.nvidia-ko: (component/nvidia-550-ko)/snap/hooks/install
-      post-refresh.nvidia-ko: (component/nvidia-550-ko)/snap/hooks/post-refresh
-      remove.nvidia-ko: (component/nvidia-550-ko)/snap/hooks/remove
+      install.nvidia-ko: (component/nvidia-550-erd-ko)/snap/hooks/install
+      post-refresh.nvidia-ko: (component/nvidia-550-erd-ko)/snap/hooks/post-refresh
+      remove.nvidia-ko: (component/nvidia-550-erd-ko)/snap/hooks/remove
 
-  nvidia-550-user-comp:
+  nvidia-550-erd-user-comp:
     source: https://git.launchpad.net/canonical-kernel-snaps
     source-type: git
     source-branch: main
@@ -169,27 +169,27 @@ parts:
       - libnvidia-gl-550-server=@SWM:nvidia-graphics-drivers-550-server@
       - libnvidia-fbc1-550-server=@SWM:nvidia-graphics-drivers-550-server@
       - nvidia-utils-550-server=@SWM:nvidia-graphics-drivers-550-server@
-      - xserver-xorg-video-nvidia-550=@SWM:nvidia-graphics-drivers-550@
-      - libnvidia-extra-550=@SWM:nvidia-graphics-drivers-550@
+      - xserver-xorg-video-nvidia-550-server=@SWM:nvidia-graphics-drivers-550-server@
+      - libnvidia-extra-550-server=@SWM:nvidia-graphics-drivers-550-server@
 
 
     organize:
-      usr/share: (component/nvidia-550-user)/usr/share
-      usr/lib: (component/nvidia-550-user)/usr/lib
-      usr/bin/nvidia-smi: (component/nvidia-550-user)/usr/bin/nvidia-smi
-      kernel-gpu-2404-provider-mangler: (component/nvidia-550-user)/kernel-gpu-2404-provider-mangler
-      install.nvidia-user: (component/nvidia-550-user)/snap/hooks/install
-      post-refresh.nvidia-user: (component/nvidia-550-user)/snap/hooks/post-refresh
-      remove.nvidia-user: (component/nvidia-550-user)/snap/hooks/remove
-
-  # Prune nvidia-550-user to prevent shipping duplicate mesa libraries
-  nvidia-550-user-cleanup:
-    after: [nvidia-550-user-comp]
+      usr/share: (component/nvidia-550-erd-user)/usr/share
+      usr/lib: (component/nvidia-550-erd-user)/usr/lib
+      usr/bin/nvidia-smi: (component/nvidia-550-erd-user)/usr/bin/nvidia-smi
+      kernel-gpu-2404-provider-mangler: (component/nvidia-550-erd-user)/kernel-gpu-2404-provider-mangler
+      install.nvidia-user: (component/nvidia-550-erd-user)/snap/hooks/install
+      post-refresh.nvidia-user: (component/nvidia-550-erd-user)/snap/hooks/post-refresh
+      remove.nvidia-user: (component/nvidia-550-erd-user)/snap/hooks/remove
+
+  # Prune nvidia-550-erd-user to prevent shipping duplicate mesa libraries
+  nvidia-550-erd-user-cleanup:
+    after: [nvidia-550-erd-user-comp]
     source: https://github.com/canonical/gpu-snap.git
     plugin: dump
     override-prime: |
       craftctl default
-      CRAFT_PRIME="$CRAFT_COMPONENT_NVIDIA_550_USER_PRIME" \
+      CRAFT_PRIME="$CRAFT_COMPONENT_NVIDIA_550_ERD_USER_PRIME" \
         "$CRAFT_PART_SRC"/bin/gpu-2404-cleanup mesa-2404
 
 
-- 
2.43.0