[SRU][kernel-snaps-uc24.04/pc][PATCH v2 1/1] snapcraft.yaml: fix source declarations, cleanup

[Aaron Jauregui]

Signed-off-by: Aaron Jauregui <aaron.jauregui at canonical.com>
---
 files/meta/kernel.yaml |  1 +
 snapcraft.yaml         | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)
 create mode 100644 files/meta/kernel.yaml

diff --git a/files/meta/kernel.yaml b/files/meta/kernel.yaml
new file mode 100644
index 0000000..aa09f00
--- /dev/null
+++ b/files/meta/kernel.yaml
@@ -0,0 +1 @@
+dynamic-modules: $SNAP_DATA
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c18888d..f4bbb42 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -46,8 +46,6 @@ parts:
     override-build: |
       craftctl default
 
-      echo BULID
-
       # Determine version and 'uname -r'
       unamer=$(basename "$CRAFT_PART_INSTALL"/lib/modules/*)
       version="$(apt show linux-image-uc-"$unamer" 2>/dev/null | sed -n 's/^Version: //p' | head -n1)"
@@ -76,7 +74,6 @@ parts:
       post-refresh.pc-kernel: snap/hooks/post-refresh
 
     override-stage: |
-      echo STAGE
 
       # Determine 'uname -r'
       unamer=$(basename "$CRAFT_PART_INSTALL"/lib/modules/*)
@@ -120,7 +117,7 @@ parts:
     source: files
 
   nvidia-550-ko-comp:
-    source:https://git.launchpad.net/canonical-kernel-snaps
+    source: https://git.launchpad.net/canonical-kernel-snaps
     source-type: git
     source-branch: main
     plugin: nil
@@ -131,7 +128,7 @@ parts:
 
     override-build: |
       craftctl default
-      version="$(craftctl get version)"
+      version=$(craftctl get version)
 
       # Duplicate libc causing conflicts, deleting to use system's libc
       rm -f -- "$CRAFT_PART_INSTALL/usr/lib/$(uname -m)-linux-gnu/libc.so.6"
@@ -144,7 +141,7 @@ parts:
       # Move hooks
       mv hooks/nvidia-ko/* "$CRAFT_PART_INSTALL"
 
-organize:
+    organize:
       bits/: (component/nvidia-550-ko)/bits
       usr/bin: (component/nvidia-550-ko)/bin
       usr/lib: (component/nvidia-550-ko)/lib
@@ -154,7 +151,7 @@ organize:
       remove.nvidia-ko: (component/nvidia-550-ko)/snap/hooks/remove
 
   nvidia-550-user-comp:
-    source:https://git.launchpad.net/canonical-kernel-snaps
+    source: https://git.launchpad.net/canonical-kernel-snaps
     source-type: git
     source-branch: main
     plugin: nil
@@ -192,7 +189,7 @@ organize:
   # Prune nvidia-550-user to prevent shipping duplicate mesa libraries
   nvidia-550-user-cleanup:
     after: [nvidia-550-user-comp]
-    source:https://github.com/canonical/gpu-snap.git
+    source: https://github.com/canonical/gpu-snap.git
     plugin: dump
     override-prime: |
       craftctl default
-- 
2.43.0