From patchwork Thu Nov 28 10:33:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1201976 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=none (p=none dis=none) header.from=ubuntu.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=surgut.co.uk header.i=@surgut.co.uk header.b="S3yIntAP"; 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 47NvB5641bz9sP4; Thu, 28 Nov 2019 21:33:33 +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 1iaH73-0002pR-8C; Thu, 28 Nov 2019 10:33:29 +0000 Received: from mail-wm1-f66.google.com ([209.85.128.66]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iaH71-0002op-3v for kernel-team@lists.ubuntu.com; Thu, 28 Nov 2019 10:33:27 +0000 Received: by mail-wm1-f66.google.com with SMTP id f129so11087676wmf.2 for ; Thu, 28 Nov 2019 02:33:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=surgut.co.uk; s=google; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=SxhC6GdcfA4D6IIDPmgbAnBCL/n2+69r7cBTF+ZN2k0=; b=S3yIntAPcQwG/3Idmt/E+gjSjLECMUYr2X+QDRAra7cpbr/+SBBtwT0m5tTyvJVUn+ mjORF11rqFFnkDx2R20eTaNT3IaNYuxPnD6Atp0Owy4WwacMShKkRcSPRS+wQkijvqDZ Tdp+UHO95dofPM5bPd9GBGW9wv1qJiIxbzNac= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=SxhC6GdcfA4D6IIDPmgbAnBCL/n2+69r7cBTF+ZN2k0=; b=WyEQg4waH6bDp7IXpY+c1L19sXDPn29OHKLGfy9+upmt50MH3GPocPV0+BpqgwWOB4 JsX/ou4lCN84Isn3sJyNDbijE7208Dt9OqeWb+ZOs/ieyeDDjCQqqARIMJISKKpz091/ UVvm/wGMtJGlvWwcBSo6ZuOA4MmgNapVGr/YHrMbtEsyut7Gz1r5tMUgK0A1yVNvvrVc NUSOpM2Qpewra77H7jiHfuswSGPOckIg1oFxdE8vnPjqKrsuPX2k9Rl1aarRgdI+dv9C CTEx3di0dmVXCISdUgJZ0HcyDjMxkbjIPP0fnNDHaXH+mCPNDsj5/c+RmAPhFX8rcEdD AdOg== X-Gm-Message-State: APjAAAXSdOSYakuBH+Bq9Z/7tE03vO8wFiK4Ep+zvhhD1OX+Dtxcyvk0 Mh/w4Vl0bgePG6/ZRDWX3vNLSu7HeSsLUw== X-Google-Smtp-Source: APXvYqyKln4Sk70w5spkgaMEueRrGKZWDphQq+mq3UKifaBrzfS/KauA1SwqYXvfHlot0vGirAcNsg== X-Received: by 2002:a1c:9c47:: with SMTP id f68mr8182324wme.147.1574937206258; Thu, 28 Nov 2019 02:33:26 -0800 (PST) Received: from localhost (9.a.8.f.7.f.e.f.f.f.2.3.f.4.a.1.1.4.e.1.c.6.e.d.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:de6c:1e41:1a4f:32ff:fef7:f8a9]) by smtp.gmail.com with ESMTPSA id w13sm22316133wrm.8.2019.11.28.02.33.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2019 02:33:25 -0800 (PST) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH] Ship UC20 initrd in the kernel snap. Date: Thu, 28 Nov 2019 10:33:23 +0000 Message-Id: <20191128103323.121767-1-xnox@ubuntu.com> X-Mailer: git-send-email 2.24.0 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: , Cc: apw@canonical.com, Dimitri John Ledkov Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" If a kernel.efi and standard embeded initrd images are produced by the initramfs tooling, include it in the snap. Previous initramfs-tools-ubuntu-core based initrd.img is still generated, and made available as well. Signed-off-by: Dimitri John Ledkov Acked-by: Andy Whitcroft Acked-by: Stefan Bader --- Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile b/Makefile index 114c16c..142d467 100644 --- a/Makefile +++ b/Makefile @@ -121,6 +121,10 @@ install: else \ mv chroot/boot/vmlinu?-* $(DESTDIR)/kernel.img; \ fi + if [ -f chroot/boot/kernel.efi-* ]; then \ + mv chroot/boot/kernel.efi-* $(DESTDIR)/kernel.efi; \ + fi + mv chroot/boot/ubuntu-core-initramfs.img-* $(DESTDIR)/ubuntu-core-initramfs.img mv chroot/boot/initrd.img-* $(DESTDIR)/initrd.img # Copy meta data into the snap. The ABI file itself actually was # not used for anything and just done for completeness. Since new @@ -167,6 +171,8 @@ install: cd $(DESTDIR); ln -s kernel.img vmlinuz-$(KVERS) cd $(DESTDIR); ln -s kernel.img vmlinuz cd $(DESTDIR); ln -s initrd.img initrd.img-$(KVERS) + cd $(DESTDIR); ln -s ubuntu-core-initramfs.img ubuntu-core-initramfs.img-$(KVERS) + if [ -e $(DESTDIR)/kernel.efi ]; then cd $(DESTDIR); ln -s kernel.efi kernel.img-$(KVERS); fi version-check: prepare-kernel { \