From patchwork Wed Nov 6 12:40:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1190379 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; dmarc=fail (p=none dis=none) header.from=canonical.com 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 477R3F061Nz9sPF; Wed, 6 Nov 2019 23:40:57 +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 1iSKcC-000095-H3; Wed, 06 Nov 2019 12:40:48 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSKcB-00008x-0x for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2019 12:40:47 +0000 Received: from mail-wm1-f71.google.com ([209.85.128.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iSKcA-0004zS-S9 for kernel-team@lists.ubuntu.com; Wed, 06 Nov 2019 12:40:46 +0000 Received: by mail-wm1-f71.google.com with SMTP id k184so882670wmk.1 for ; Wed, 06 Nov 2019 04:40:46 -0800 (PST) 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=9dnFn1gl79jcUPRT7FWKQDbP0O0ZzhA9yi04PtpXfog=; b=HGxSPqfYEa98v2BniWkjB2SEqtH5vjNYJLVPbWgjp5jGPVAeowAjf3aMluIMMwsnjo KqMDcPpVfe32jPGTU3sBxITocG7xLBD2BahIvR47nZUVP5wUVaCCbKM9UUoOyrZFcZob ylrc/T7MwgnojQL1m8g/wcWDn+6cZGCZbrKAhRCyEr3L2/xWy6WZdyD2FF/Ok/MFNHyG lUbRxYvhDroVVR5IpH49rNlCf30fXjNKoEaukPHx/Y7ftOm+mBri/Zh5cCldspVX4oy2 LBWttUzKMlvET20ELRjpDTwZ3dSCKaPKq9rDEt/D41f9yYHLd4oVTrRh2Y2xAx7NYFvU 8zDw== X-Gm-Message-State: APjAAAXos8+9hO2HbyDo136R7SjBZbaT9BhLPjBWKDWbJDHKmNtp1Apo 3m5qncTawb5g76H52Ue4cJ1JW9LZLzQCTSpRn9wkncWx1YyRM8WK8RRHCwFnhSld1dzyZePU/ia pqMXaxEw9HYGglFbMem+nswoLhXtas7tfSPfdXJwfwg== X-Received: by 2002:a7b:cd83:: with SMTP id y3mr2525874wmj.150.1573044046354; Wed, 06 Nov 2019 04:40:46 -0800 (PST) X-Google-Smtp-Source: APXvYqzVnHTpICysqd1e5Wsq9/aHRuDwYYLb2s8f4LBOj/m/l8cDBqYgEPOvimbSHF6Ih6v/Dghkew== X-Received: by 2002:a7b:cd83:: with SMTP id y3mr2525858wmj.150.1573044046140; Wed, 06 Nov 2019 04:40:46 -0800 (PST) Received: from gollum.fritz.box ([194.191.228.147]) by smtp.gmail.com with ESMTPSA id y19sm3480550wmd.29.2019.11.06.04.40.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2019 04:40:45 -0800 (PST) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][D/E/F:raspi2][PATCH] UBUNTU: [Packaging] raspi2: Fix snapcraft.yaml Date: Wed, 6 Nov 2019 13:40:44 +0100 Message-Id: <20191106124044.21632-1-juergh@canonical.com> X-Mailer: git-send-email 2.20.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" BugLink: https://bugs.launchpad.net/bugs/1851469 The current snapcraft.yaml file on the raspi2 branch is the one from the main/master kernel and not the raspi2 version. Fix that. Signed-off-by: Juerg Haefliger Acked-by: Connor Kuehl Acked-by: Stefan Bader --- snapcraft.yaml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 2452c4031066..e10e356c9189 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -1,10 +1,10 @@ -name: pc-kernel +name: pi2-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 raspi2 Linux kernel +description: The Canonical raspi2 Linux kernel grade: stable confinement: strict type: kernel @@ -14,14 +14,17 @@ parts: plugin: kernel source: . source-type: git - kconfigflavour: generic + kconfigflavour: raspi2 kconfigs: - CONFIG_DEBUG_INFO=n + kernel-image-target: zImage + kernel-with-firmware: false override-build: | cp debian/scripts/retpoline-extract-one \ $SNAPCRAFT_PART_BUILD/scripts/ubuntu-retpoline-extract-one snapcraftctl build - kernel-with-firmware: false + tar -C $SNAPCRAFT_PART_INSTALL/dtbs -f $SNAPCRAFT_PART_INSTALL/dtbs/overlays.tgz -czv overlays + rm -rf $SNAPCRAFT_PART_INSTALL/dtbs/overlays firmware: plugin: nil stage-packages: @@ -34,3 +37,4 @@ parts: build-packages: - cpio - libssl-dev + - dpkg-dev