From patchwork Wed Jul 21 09:19:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1508044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: 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=Ryiiczx1; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GV95b5cQlz9sWX; Wed, 21 Jul 2021 19:19:47 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m68OF-0002T4-2b; Wed, 21 Jul 2021 09:19:43 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-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 1m68OD-0002Sx-55 for kernel-team@lists.ubuntu.com; Wed, 21 Jul 2021 09:19:41 +0000 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.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-canonical-1.canonical.com (Postfix) with ESMTPS id 09EBD3F23A for ; Wed, 21 Jul 2021 09:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626859181; bh=86WvakCNn9uKn8scr0NevE/FPsXhZXhjvSD1x/Zx5DQ=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=Ryiiczx14faciRj6e279oHkecc7mtltt2VIw86REJhjr/rfIaDcCix8csBm002ZTX e6aUChQAF6O/jho1yvnmXYsEAzPmuywT/c8rilWFSvXo3IJ7gy8MroMX3Ts7s1SDt6 rEhnsKHFQtWEAP15in8yR4MUuPqUNRupITuu3OsaiNHyaglEdynAqSF6DgVcUwhtQR illX1fOFytoa7dA7haWdOEyKuN71JnbIxAq/c2+FqppR/hr06xl6slCoJYJd9zoso8 HSYO5Iu2QoBMu400kAfqiq41Zm46FxGEuLM4W9W16jHAn1m/jNhM+sOvGMrYQn/IIO fvOK19sbGT4dA== Received: by mail-wr1-f69.google.com with SMTP id r18-20020adfce920000b029013bbfb19640so729204wrn.17 for ; Wed, 21 Jul 2021 02:19:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=86WvakCNn9uKn8scr0NevE/FPsXhZXhjvSD1x/Zx5DQ=; b=oyF462dOoi7VPzR3YJ8QLLbvUqvJL1S62N4UMzgv+KVPjKoGU5cLlIsekZuGGrlvML Ui7l4WMc2nCcQCYUO59L7fYVg77EbEfbL1TbQYqjN2TbR1kW8k3JsfL3x92nNBhspN3I CiDpJ2aRIzdMZHZvp8C0NkKVLbpndBM/oGop2IIO/XMeCLv4cJ85u39Np68oF37BUCN8 dHtZyBLmdVDywRQqKi9cULHbOnLxa7mzlvF0DpyWEI43PR9IbxQtJtQWwmFvf2n6iUIO 0I856FSTNrSBbdtYzPGK8AZnu7cH2KxEO/QGI4VkxRn53zlteT8FLYNGPiSTzm/y2i8M 0ReA== X-Gm-Message-State: AOAM532Z0yPJkMOx0UhawiED+P3Bv+ZYE1qsYLr+3maoJi+VN1aWYZVX 9Uuip18WBopzjx182tjg5ARkMTaIHvhhGx7bIESicH6qwJgdRpiGVPeGkMNle72RGiurpNWp2tJ ry7/UeVQz4VHMSiqrzG8vnTTZBL3Zp6zvq03+RU1gCA== X-Received: by 2002:a1c:720f:: with SMTP id n15mr2890112wmc.172.1626859180488; Wed, 21 Jul 2021 02:19:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyN6p6A+HrLX9Kg1Xy5jSPQNX00i/ZXlRipSA1+/wwqlJjZSCgWpa0qpM6+VC8auLT36PF7Rw== X-Received: by 2002:a1c:720f:: with SMTP id n15mr2890087wmc.172.1626859180171; Wed, 21 Jul 2021 02:19:40 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:f865:1f1c:b7d5:104f]) by smtp.gmail.com with ESMTPSA id d10sm26048975wro.43.2021.07.21.02.19.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jul 2021 02:19:39 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [pc-snap PATCH] snapcraft.yaml: avoid shell expansion in snapcraft.yaml Date: Wed, 21 Jul 2021 10:19:37 +0100 Message-Id: <20210721091937.178067-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 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" As per schema, make-paramemters are strings, not interpreted/evaluated values. Move efi vs vmlinuz choice to build-environment with declarative advanced grammar to select efi on amd64 only. Signed-off-by: Dimitri John Ledkov Acked-by: Stefan Bader --- This is failing to build with stable snapcraft so pushing this to get the current set of snaps to build. Tested with local snapcraft build. snapcraft.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 525d2fa..b402017 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -12,10 +12,14 @@ parts: source-type: git source-branch: master plugin: make + build-environment: + - on amd64: + - KERNEL_IMAGE_FORMAT: efi + - else: + - KERNEL_IMAGE_FORMAT: vmlinuz make-parameters: - KERNEL_SOURCE=focal:linux-uc20-efi - KERNEL=linux-pc-image - - KERNEL_IMAGE_FORMAT=$(if $(filter x86_64,$(shell uname -a)),efi,vmlinuz) - PROPOSED=true build-packages: - debootstrap