From patchwork Wed Mar 8 16:39:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1754207 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=Xi6kEZs3; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PWyjJ2649z246v for ; Thu, 9 Mar 2023 03:40:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pZwpe-0000Ly-9l; Wed, 08 Mar 2023 16:40:02 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pZwpb-0000KX-PI for kernel-team@lists.ubuntu.com; Wed, 08 Mar 2023 16:39:59 +0000 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 8C6CC3F592 for ; Wed, 8 Mar 2023 16:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1678293599; bh=rMu+dxru2LGBylX5XMZT8Q14P9zijClqXtG86JVzXvQ=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Xi6kEZs38wyGQ3zXkLpVsYGIvCwgcw4nI6QWSZqL3G9/oRb6CrJ4HhgPC96lMnIAB 2gLAWffYrzK9/B4gKntz3wKnaWd8Wz8rNBFLdxJNsuakbfvFXg/1OeES0VHvLzKBMB GaYRTZq5u877sndJEG0PCYB11QffdFI8nRqhAY4eOLbvEEDm9H/MJcBIR0XZmLL96B ObRtmjTLyLF9hDicjCQuyHPZ5fTdIEkya0vfGtcrN+b2GmWqK5iIihv1SAuMyvDnut B0p/OEcguC/yIxXzOSeEgaapAKHMtJNcLzwKfQVQM2mwOYsx/jGCM4QNGPv1iRfLki ASMQVtYwakq9A== Received: by mail-wm1-f69.google.com with SMTP id m31-20020a05600c3b1f00b003e9de8c95easo6071554wms.2 for ; Wed, 08 Mar 2023 08:39:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678293599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rMu+dxru2LGBylX5XMZT8Q14P9zijClqXtG86JVzXvQ=; b=Pscimh/3z1ai9rSaQ3Fc0RW0wWROgMhtdl6TJUFWqfCQg2NQAQD+qc0z+umAz8JaC1 EA5mVyyBLYC3N1q3tEut4uxJW/2pvJVdcvKyblPu5AtiNGthP81VLDhwOgI+WbapUgVv /YwZPVarrUrWnhPgqRK4sW8efglAcmSljo+e2qgbehsloegM1CVBCenUhf/rtpR8BR9x gtWcaDG4yipawFpDXX7SZSRR/xEbUjvlXOj5AJemGOm6unEPDKfm+8PuBCF2iOL2LqDr YD7o7qEog7jz9yyWNFxR4M+zdMCAF+u/b4nkUKXXTaC+FfLiVN+bhS/sg1FCTO1eGoCV Noyg== X-Gm-Message-State: AO0yUKWNpbdFomqs5KWGGB8muRwzj7edD9upkp/BfRniAEQsepIx8Tjt zQyIHJ5I2Yz+hY2HJHIn/9Gzzg8F1kGH+JlkRxY/SVVZEDu/mu3PP60TD+hoLD7CDV268jBSHOK N7klkJ5QVpFp+cTWe38vzd2xeeQwU99t5zw0P3dp+UGMnN4bkLRoL X-Received: by 2002:a05:600c:4509:b0:3eb:32ff:da8 with SMTP id t9-20020a05600c450900b003eb32ff0da8mr17945074wmo.16.1678293599083; Wed, 08 Mar 2023 08:39:59 -0800 (PST) X-Google-Smtp-Source: AK7set83dRsBNvW5CmkyoAqDjYqUfUcq2yf4xdo9nyLywaZ1ON7WcoML68pbX8PAo89EktXZt6xJsQ== X-Received: by 2002:a05:600c:4509:b0:3eb:32ff:da8 with SMTP id t9-20020a05600c450900b003eb32ff0da8mr17945058wmo.16.1678293598776; Wed, 08 Mar 2023 08:39:58 -0800 (PST) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id k7-20020a05600c080700b003e21ba8684dsm16497430wmp.26.2023.03.08.08.39.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 08:39:58 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3] Remove nouveau when shipping nvidia driver Date: Wed, 8 Mar 2023 16:39:53 +0000 Message-Id: <20230308163955.41348-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230308163955.41348-1-dimitri.ledkov@canonical.com> References: <20230308163955.41348-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Dimitri John Ledkov --- snapcraft.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 96b5b53330..5391553aef 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -44,6 +44,8 @@ parts: if [ -d "$SNAPCRAFT_PART_INSTALL"/usr/share/doc/linux-signatures-nvidia-*-generic ]; then cd "$SNAPCRAFT_PART_INSTALL"/lib/modules/*/kernel/nvidia-*/bits sh BUILD + # Remove nouveau + rm -rf "$SNAPCRAFT_PART_INSTALL"/lib/modules/*/kernel/drivers/gpu/drm/nouveau # Update depmod depmod -b "$SNAPCRAFT_PART_INSTALL" $(basename "$SNAPCRAFT_PART_INSTALL"/lib/modules/*) # Trim firmware From patchwork Wed Mar 8 16:39:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1754205 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=qbNYjMn+; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PWyjJ1vXSz246p for ; Thu, 9 Mar 2023 03:40:18 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pZwpi-0000N2-2R; Wed, 08 Mar 2023 16:40:06 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pZwpc-0000Kl-MW for kernel-team@lists.ubuntu.com; Wed, 08 Mar 2023 16:40:00 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2C5753F11D for ; Wed, 8 Mar 2023 16:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1678293600; bh=FnSXwt+bv4YmKNHv8PjbdXPCwnDfvqJfMfjJQhzvTnE=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qbNYjMn+Ng1cjSfORNPvcF5mcyErqmncaGw/Yx1Xxcbhln2Fa1Ov31KvuoG1pIqSX /JjyXhAjTRFivfUwBcWsP30Ow7xsZUFM06uU3v60D9WZM/oM/t/B3mcMe+U0F3XHHz e1Z64wXp8acAGLMf/0sTpnwcHmOwCNTK20lQDND6Qn3wVHife8fPA1crAhmecfJ8i0 70lJiGtt2mV2Onqt6+t8HBsze6RoFaJVl2jO53JG5pFrT8L9j3XESfJKq801Ox9lDN 9NhpDdeQdiiLmmJjCD3QL4Uq47mrdV5yobc32Btr/eSfwn4dKiXm0oUI4HtbIt0ZCV HbI21n3Fu3AGw== Received: by mail-wm1-f72.google.com with SMTP id j6-20020a05600c1c0600b003eaf882cb85so1011881wms.9 for ; Wed, 08 Mar 2023 08:40:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678293599; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FnSXwt+bv4YmKNHv8PjbdXPCwnDfvqJfMfjJQhzvTnE=; b=vE7+caYkweesMydpTZcPBv7OAbtkwwhLq/Ontc6oDNrkuYcefbe/pEnAqXk6W8ByS8 /2A9bckwGMFMDXnPkOe0a6K0tRd4f7rCCzzNTNPt0ZOh1niYE0P0TXypig7Vdi64tnE3 1GujL5HfQwvroqXRiElH9K84ZH8jELl6MDWF30CZN8z1rofKuNHkhKd2K6AlOY9AFZ6o 9kVUD04WlsyhT4ETFkn6nt+vYy+UWedtLnVeCeCSe2Dduhk16DtW0qqL4cBrSYQRYBhI f1boWvLBMWCJ16fgwcjr25+ckLqICClNoti/bgPZ47UfpH5SjlI5FZDOhp2wUGEtIaj5 Oc3Q== X-Gm-Message-State: AO0yUKXlSLPemue+nIPyXW/Sm6GOYuTHlXY80GYBRb3T7xF8qSQ46Do6 5B6nql6bc0K8OS4/Y/S5OgFVZ5C468Fi5pSGOu3js2GfwgH3BKaRhJkkE5EzHV9FdVoBT2KidId SZ9+wcZN6S4pCYmxxpqj5jzlGB9rB2sVz/CulhPYulV62LX5jaxyh X-Received: by 2002:a05:600c:5101:b0:3e0:17d:aeaf with SMTP id o1-20020a05600c510100b003e0017daeafmr16365624wms.7.1678293599597; Wed, 08 Mar 2023 08:39:59 -0800 (PST) X-Google-Smtp-Source: AK7set+XKrHfEGbUdJx5g3v+C/52Y2Kb43TifXtHpdk0cpE1KA+1GpR4yt+G8EsH6IBLEzYdxymv7A== X-Received: by 2002:a05:600c:5101:b0:3e0:17d:aeaf with SMTP id o1-20020a05600c510100b003e0017daeafmr16365612wms.7.1678293599286; Wed, 08 Mar 2023 08:39:59 -0800 (PST) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id f12-20020a5d58ec000000b002c71b4d476asm15716323wrd.106.2023.03.08.08.39.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 08:39:59 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] Provide nvidia.ko symlinks to nvidia-assemble snap common directory Date: Wed, 8 Mar 2023 16:39:54 +0000 Message-Id: <20230308163955.41348-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230308163955.41348-1-dimitri.ledkov@canonical.com> References: <20230308163955.41348-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Dimitri John Ledkov --- snapcraft.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/snapcraft.yaml b/snapcraft.yaml index 5391553aef..47e87a2c0e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -52,6 +52,12 @@ parts: "$SNAPCRAFT_PART_SRC"/trim-firmware "$SNAPCRAFT_PART_INSTALL"/lib # Clean nvidia modules sh CLEAN + # Fake the nvidia.ko modules pointing at an nvidia assemble location + cd ../ + for module in nvidia-drm.ko nvidia-modeset.ko nvidia-peermem.ko nvidia-uvm.ko nvidia.ko + do + ln -s /var/snap/nvidia-assemble/common/nvidia-driver/$module $module + done else # Update depmod depmod -b "$SNAPCRAFT_PART_INSTALL" $(basename "$SNAPCRAFT_PART_INSTALL"/lib/modules/*) From patchwork Wed Mar 8 16:39:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1754206 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=WqBWhy0L; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PWyjJ2Glhz246w for ; Thu, 9 Mar 2023 03:40:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1pZwpl-0000Ok-D2; Wed, 08 Mar 2023 16:40:09 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1pZwpd-0000Kz-1F for kernel-team@lists.ubuntu.com; Wed, 08 Mar 2023 16:40:01 +0000 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id B71003F11D for ; Wed, 8 Mar 2023 16:40:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1678293600; bh=FpXR5tfc2HGvMJi1IT/Y5QURyeC/83/rLIDqq24frI4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WqBWhy0Lgq2qQhDxMCZ8gkGSlqTU8OUF3f+9bMnYPHHtNr4TVZ2df0mIgpUlqRfCo NcgMJiTvToX7gA1W03iUM2QkkOG/SPnAiqjrTNqWMdi43lSn2IKxRPmvHiRj3gVIfQ FsmrcL9JFiBez8ypOPidSydmxrljnzCcEm757Ae7KKwRQG4sTA24wi7ksgwnop4YDO jq7J8wPmGyOz5ImWss3CMy5mX8R9LZpGWrTZ/6cBKE3s6kesQkRDG2ISBk4FrfBFJY yMcwK2PKLaRLVaLB77VpSjyTCL6tNAY9fNH+oU5pwcB8ELTDA5bngERLqL0m1r+LaN TTv5l/4dyRa7A== Received: by mail-wm1-f71.google.com with SMTP id e22-20020a05600c219600b003e000facbb1so1149406wme.9 for ; Wed, 08 Mar 2023 08:40:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678293600; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FpXR5tfc2HGvMJi1IT/Y5QURyeC/83/rLIDqq24frI4=; b=fLEZsDFTlI7u6BXynLe3qBks0bn1SHbRr+X0AeoyWLwfvOCgDMSfiMmRMxeENykuEc yAz5dNS3/7IvnIoyVCBb2/cKchE+pB7HJPS8MjLUHmNsRdB7ijoUe0I+ELQhJmitzW6E 8Pj8Z0AXcsYZdOwwA9tWKgOfk1OMkp29nTcX9n+eMXObVExdhVYGQ3t/EZysifeHVqDP XjN6UQSSn6fKuvl5M24jnbfEnqRczV0eOzNx1LFutoK8svoC2DSdusDUQwYMyCbRAcLm /2VudEdrcFiOJxrfw0GwuQe1JBUrnAyQQh4kS385Nza+AXsSDT/LS0qYVh3wb5WtM6/n W9cA== X-Gm-Message-State: AO0yUKXeqsRg9kfNqpoNm9bWzDYGHjpSMa+0Ge4GP9q5rRq+MRiaPYDz /PJ1fo1lHepSfqvSrRZYfSwn9rlMCy65MMnSClzg2/WpeI88VubuJg6fDx+yT8sxyuvdiBePzfA 4u3byn3fS6T5bL+UC99X3vd5Pc0WV+e2/Gbi2tA2Z+ZV+Fl9Jq1jd X-Received: by 2002:a5d:52cd:0:b0:2ca:554c:17ab with SMTP id r13-20020a5d52cd000000b002ca554c17abmr11478170wrv.25.1678293600118; Wed, 08 Mar 2023 08:40:00 -0800 (PST) X-Google-Smtp-Source: AK7set8ZGXIAq6u1jlAEX1DRpU01AzgihRALQw+WXTpDxOt5FKZAqNnMijqRiWtVZaGke84Vrs/sug== X-Received: by 2002:a5d:52cd:0:b0:2ca:554c:17ab with SMTP id r13-20020a5d52cd000000b002ca554c17abmr11478151wrv.25.1678293599761; Wed, 08 Mar 2023 08:39:59 -0800 (PST) Received: from localhost ([137.220.91.195]) by smtp.gmail.com with ESMTPSA id v2-20020adfe282000000b002c7066a6f77sm15483912wri.31.2023.03.08.08.39.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Mar 2023 08:39:59 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3] Allow shipping unstripped linux-restricted-signatures Date: Wed, 8 Mar 2023 16:39:55 +0000 Message-Id: <20230308163955.41348-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230308163955.41348-1-dimitri.ledkov@canonical.com> References: <20230308163955.41348-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Signed-off-by: Dimitri John Ledkov --- snapcraft.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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