From patchwork Mon Jun 26 09:04:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 780618 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wx3640HZfz9s65; Mon, 26 Jun 2017 19:04:44 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1dPPwn-0004Co-DO; Mon, 26 Jun 2017 09:04:41 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1dPPwf-0004BN-9a for kernel-team@lists.ubuntu.com; Mon, 26 Jun 2017 09:04:33 +0000 Received: from 1.general.ppisati.uk.vpn ([10.172.193.134] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1dPPwe-0001ov-Vs for kernel-team@lists.ubuntu.com; Mon, 26 Jun 2017 09:04:33 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: snapcraft.yaml: various improvements Date: Mon, 26 Jun 2017 11:04:32 +0200 Message-Id: <1498467872-15077-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498467872-15077-1-git-send-email-paolo.pisati@canonical.com> References: <1498467872-15077-1-git-send-email-paolo.pisati@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/1700480 This patch improves over the original snapcraft.yaml we ship in Xenial, and makes the generated kernel snap nearly identical to the one we ship in the store. Among the different improvements, we have: 1) include the linux-firmware package in the final snap 2) rename it to pc-kernel to match the snap we have in the store 3) dynamic versioning 4) autogenerated config from debian.$DEBIAN/config/* 5) generate from the same snap versions for i386, amd64, armhf, arm64, ppc64el and s390x Signed-off-by: Paolo Pisati Acked-by: Colin Ian King Acked-by: Shrirang Bagul --- snapcraft.yaml | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 9ecb77df..9eb3f40 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,7 +1,12 @@ -name: ubuntu-generic-kernel -version: 4.4.0 -summary: The generic kernel for snappy -description: This is a generic snapped kernel, based off the xenial src and config +name: pc-kernel +version: null +version-script: | + . debian/debian.env + dpkg-parsechangelog -l $DEBIAN/changelog -S version +summary: The Ubuntu generic Linux kernel +description: This Ubuntu generic Linux kernel +grade: stable +confinement: strict type: kernel parts: @@ -9,8 +14,18 @@ parts: plugin: kernel source: . source-type: git - kdefconfig: ['--makefile=debian/snapcraft.mk', 'branch=master','flavour=generic', 'config'] + kconfigflavour: generic kconfigs: - - CONFIG_LOCALVERSION="-xenial_generic" - CONFIG_DEBUG_INFO=n - kernel-image-target: bzImage + firmware: + plugin: nil + stage-packages: + - linux-firmware + organize: + lib/firmware: firmware + prime: + - -usr + - -lib + build-packages: + - cpio + - libssl-dev