From patchwork Mon Sep 5 07:16:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Hui Lee X-Patchwork-Id: 1674108 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=RGoQ017x; 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 4MLfvq6kk7z1yhr for ; Mon, 5 Sep 2022 17:16:38 +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 1oV6LH-0003gG-3E; Mon, 05 Sep 2022 07:16:23 +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 1oV6LF-0003g4-6m for kernel-team@lists.ubuntu.com; Mon, 05 Sep 2022 07:16:21 +0000 Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) (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 D23DF3F0BC for ; Mon, 5 Sep 2022 07:16:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1662362180; bh=CT9rzwa/TkUvCzQ/K5+Mzy62vg2PSa3c1hfpvV53nPg=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=RGoQ017xIjh64Cr0++WxUZucvQnDzNBg+d01SJ6rL6rCTA4X/WqCDcubgeB2YzFCx p8pfqx7JepEZdgmsgbZbIxYcTomkBJCKMZsygb/FeZ/GMnqEdBvFWI55CbikBNH9X1 a0IuK/2lMadqXjPA+NC5xfM8CmHCj8PsdUFsu1NulY3glzuV6H7/uxUsd/4P+lqN8P XBeSifGJQDVajFGpKcVzMSSkWlcMENW3hS7x2FI0JYJNQnNg6elsS/+PIJAi2CO4ps zrgm9XbV+/Dqo/tmdkXoZDvm71HH3naP2NjVWbbh+q6Qf4U4xDiJ30bwfId3oZK6VX XNACVCpDLArvQ== Received: by mail-pl1-f197.google.com with SMTP id k3-20020a170902c40300b001743aafd6c6so5672347plk.20 for ; Mon, 05 Sep 2022 00:16:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=CT9rzwa/TkUvCzQ/K5+Mzy62vg2PSa3c1hfpvV53nPg=; b=hsFfsnAvmjhrxOS8NY600WMc2fv2bwXFO/QLIJQgC5DMTff4zKAyJLEVxzoQFgWXw+ eq6vrg7PVOz6KBMASf1g8kYcExBwN1t1SJXlsvzM6m/q+plm9SqcszUAzLsmUfccWriL AxML2CeY7Vx+G4LE0503GQOWjf8W74zsIbClGdUE4XlwvIwkykPdhqj2ddCIFF7eepN7 P4KGIgSEUw7yjBxB+PF+ekv3LckwMLDwbKHrHWm3L8tZ/UTEB3VuauHeVfLc/6B4BPz7 bXuAZLEmnTyDGr5Wm76ctADuTDPM0KVos9Ly+yNyWF2f+33zCiEsMRYD9ZNHKZ7+YKcn jJ5w== X-Gm-Message-State: ACgBeo0dC40VQsgGEawE42UdtfRucEK2TyEjTdEmxx9Z7WpyOAC/wDvm SLYTZaPEPO12tGWtd71Q4eN8DgKwXH8LvU7VCqSy02iw3gdTJ3mJ7alYuSN773moluSFIa3YRrp jhWtsDhcXKJWhY6AqWCawzZ1EecPXvc47PGnL8IUkUQ== X-Received: by 2002:a17:902:bd49:b0:172:df88:8981 with SMTP id b9-20020a170902bd4900b00172df888981mr47881912plx.120.1662362179488; Mon, 05 Sep 2022 00:16:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR58qjRaLb8qtr85AYB9ngdlDyYn/+o8olfRgina74bKG9At8KQqiD5nSpnVTUAoXey2Ogqi3Q== X-Received: by 2002:a17:902:bd49:b0:172:df88:8981 with SMTP id b9-20020a170902bd4900b00172df888981mr47881892plx.120.1662362179143; Mon, 05 Sep 2022 00:16:19 -0700 (PDT) Received: from Razer-Stealth.. (1-163-136-33.dynamic-ip.hinet.net. [1.163.136.33]) by smtp.gmail.com with ESMTPSA id w69-20020a628248000000b00537f16e25d3sm6847478pfd.75.2022.09.05.00.16.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 00:16:18 -0700 (PDT) From: Jian Hui Lee To: kernel-team@lists.ubuntu.com Subject: [kernel-snaps-uc20:intel][PATCH] intel: repack intel-kernel snap from intel-iotg-kernel snap Date: Mon, 5 Sep 2022 15:16:15 +0800 Message-Id: <20220905071615.523877-1-jianhui.lee@canonical.com> X-Mailer: git-send-email 2.34.1 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" This patch rewrites intel-kernel snapcraft.yaml packaging to repack from intel-iotg-kernel snap by using stag-snaps. Signed-off-by: Jian Hui Lee --- kernel-info.yaml | 2 +- snapcraft.yaml | 26 +++++++++++--------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/kernel-info.yaml b/kernel-info.yaml index 986c92c..acaad8c 100644 --- a/kernel-info.yaml +++ b/kernel-info.yaml @@ -2,5 +2,5 @@ # Kernel Source Information # series: focal -source: linux-uc20-intel +source: linux-uc20-intel-iotg version: 5.13.0-1017.19.1 diff --git a/snapcraft.yaml b/snapcraft.yaml index 9a2b636..1b03d8b 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,24 +1,20 @@ name: intel-kernel -version: 5.13.0-1017.19.1 +adopt-info: kernel summary: generic linux kernel description: The Intel Ubuntu kernel package as a snap type: kernel +grade: stable confinement: strict build-base: core20 parts: kernel: - source: git://git.launchpad.net/~canonical-kernel-snaps/+git/kernel-snaps-uc20 - source-type: git - source-branch: master - plugin: make - make-parameters: - - KERNEL_SOURCE=focal:linux-uc20-intel - - KERNEL=linux-image-uc20-intel - - KERNEL_IMAGE_FORMAT=efi - - PROPOSED=true - build-packages: - - debootstrap - - gnupg - - kmod - - lsb-release + plugin: nil + # Set this snap version to the meta version of kernel.efi + override-pull: | + snapcraftctl pull + snapcraftctl set-version "$(snap info intel-iotg-kernel | yq '.channels.20/stable | split(" ").0')" + build-snaps: + - yq + stage-snaps: + - intel-iotg-kernel/20/stable