diff mbox series

[3/3] Allow shipping unstripped linux-restricted-signatures

Message ID 20230308163955.41348-4-dimitri.ledkov@canonical.com
State New
Headers show
Series Prepare for nvidia-assemble on UC20 | expand

Commit Message

Dimitri John Ledkov March 8, 2023, 4:39 p.m. UTC 
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 snapcraft.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/snapcraft.yaml b/snapcraft.yaml
index 47e87a2c0e..1a32adb354 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -42,7 +42,7 @@  parts:
         mv "$SNAPCRAFT_PART_INSTALL"/boot/vmlinuz-* "$SNAPCRAFT_PART_INSTALL"/boot/vmlinuz
       fi
       if [ -d "$SNAPCRAFT_PART_INSTALL"/usr/share/doc/linux-signatures-nvidia-*-generic ]; then
-        cd "$SNAPCRAFT_PART_INSTALL"/lib/modules/*/kernel/nvidia-*/bits
+        cd $(dirname "$SNAPCRAFT_PART_INSTALL"/lib/modules/*/kernel/nvidia-*/bits/SHA256SUMS)
         sh BUILD
         # Remove nouveau
         rm -rf "$SNAPCRAFT_PART_INSTALL"/lib/modules/*/kernel/drivers/gpu/drm/nouveau
@@ -92,5 +92,5 @@  parts:
       snapcraftctl stage
       # Check that only one nvidia series got shipped
       if [ "$SNAPCRAFT_TARGET_ARCH" != "armhf" ]; then
-        [ $(ls "$SNAPCRAFT_STAGE"/modules/*/kernel | grep nvidia | wc -l) -eq 1 ]
+        [ $(ls "$SNAPCRAFT_STAGE"/modules/*/kernel/nvidia-*/bits/SHA256SUMS | wc -l) -eq 1 ]
       fi