From patchwork Mon Jun 26 14:23:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 780737 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 3wxBBL01scz9s8N; Tue, 27 Jun 2017 00:23:54 +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 1dPUvf-0007sv-43; Mon, 26 Jun 2017 14:23:51 +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 1dPUvX-0007sR-5x for kernel-team@lists.ubuntu.com; Mon, 26 Jun 2017 14:23:43 +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 1dPUvW-0001qa-SR for kernel-team@lists.ubuntu.com; Mon, 26 Jun 2017 14:23:42 +0000 From: Paolo Pisati To: kernel-team@lists.ubuntu.com Subject: [PATCH] UBUNTU: snapcraft.yaml: various improvements Date: Mon, 26 Jun 2017 16:23:42 +0200 Message-Id: <1498487022-7461-2-git-send-email-paolo.pisati@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498487022-7461-1-git-send-email-paolo.pisati@canonical.com> References: <1498487022-7461-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/1700576 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-firmwar and linux-firmware-snapdraone packages in the final snap 2) rename it to snapdragon-kernel to match the snap we have in the store 3) dynamic versioning 4) autogenerated config from debian.$DEBIAN/config/* Signed-off-by: Paolo Pisati Acked-by: Stefan Bader Acked-by: Colin Ian King@canonical.com --- snapcraft.yaml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 9eb3f40..9ceba92 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,10 +1,10 @@ -name: pc-kernel +name: dragonboard-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 +summary: The canonical snapdragon arm64 kernel +description: The canonical snapdragon arm64 kernel grade: stable confinement: strict type: kernel @@ -14,18 +14,24 @@ parts: plugin: kernel source: . source-type: git - kconfigflavour: generic + kconfigflavour: snapdragon kconfigs: - CONFIG_DEBUG_INFO=n + install: | + cp $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc-snappy.dtb $SNAPCRAFT_PART_INSTALL/dtbs/qcom/apq8016-sbc.dtb firmware: plugin: nil stage-packages: - linux-firmware + - linux-firmware-snapdragon organize: lib/firmware: firmware prime: - -usr - -lib + install: | + mkdir -p $SNAPCRAFT_PART_INSTALL/firmware/wlan + ln -s /run/macaddr0 $SNAPCRAFT_PART_INSTALL/firmware/wlan/ build-packages: - cpio - libssl-dev