From patchwork Wed Jul 17 12:14:27 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: 1133286 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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="QX8e+OLx"; 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 45pbmW2qlRz9s7T; Wed, 17 Jul 2019 22:14:35 +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 1hnipM-0006cx-2e; Wed, 17 Jul 2019 12:14:32 +0000 Received: from mail-wm1-f67.google.com ([209.85.128.67]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hnipK-0006cr-Nm for kernel-team@lists.ubuntu.com; Wed, 17 Jul 2019 12:14:30 +0000 Received: by mail-wm1-f67.google.com with SMTP id s3so21929506wms.2 for ; Wed, 17 Jul 2019 05:14:30 -0700 (PDT) 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=e32dYPNvAWaB7Tw7DhFEIC0BZYKbxwLiSWrzsI8lqXU=; b=QX8e+OLx4EpZ25VgL2VWVMn6V1Ep0u58lanIQnwThG04oB0VklqNWKKvDzCUNJDXWr 0Sqak+2siJ1+ZrnHKTLPhvVz4TVINIru0DY7S9xIOBhjBoXhzpf3kNi7aoUY15SdWVLe 2PN+t6h3XbpEXcrZVBhfbUSorYuk3Ed4PYpIU= 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=e32dYPNvAWaB7Tw7DhFEIC0BZYKbxwLiSWrzsI8lqXU=; b=DYYeMzrrt41kXdGngekQRWi9UTu3TabKKQQOpcPbCPnZ8wn18LnvGnVVNXx6fhzWVK OpaKhsrNlbfqRFpODhfVAfkhBTXMHEPesXNrT997j79g0UEttw+Pmdzf8x4VtWRe8Oq7 STxANlOpoCuEMYzA6sN8QwyLhvYd5NQzX1+6Qz3zuwNd6zA73G/qf/AB0RiKXHMq880h GH95hE47k7aRLyh7DaZlDe7j0Xlskq0Fc4snE1jVNbNLIMIQF81VzpDCxGbkAw0GpJP4 eJU9xl4ysd3tdB45Z3sBLLFBXTrX5oNq0piCzUTmca63Zjfh99BZLDc0izVpF4L2hUvV TOsQ== X-Gm-Message-State: APjAAAVnnBp5tuV4QDJVVDfGcEuns9UVL0lEc2pNw8mdreQDHajeeikl dgubGf6TzdlusTLQbFiCDa98cIv5 X-Google-Smtp-Source: APXvYqyU2kpOxta5uhVsuQF1GotXRdc66YXR7jyUZY18jbyMby0kVuMD7EVp5wcQbjiZ/5RM706lTg== X-Received: by 2002:a7b:cf3a:: with SMTP id m26mr37747888wmg.6.1563365669827; Wed, 17 Jul 2019 05:14:29 -0700 (PDT) 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 v15sm23469417wrt.25.2019.07.17.05.14.28 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 17 Jul 2019 05:14:29 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH v2 linux-signed][EOAN UBUNTU: enable secureboot signing on s390x. Date: Wed, 17 Jul 2019 13:14:27 +0100 Message-Id: <20190717121427.23797-1-xnox@ubuntu.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: , Cc: Dimitri John Ledkov Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Bug-Link: https://bugs.launchpad.net/bugs/1829749 Signed-off-by: Dimitri John Ledkov Acked-by: Andy Whitcroft --- changes since v1: - fix typpo, missing ';' after done Test build completed in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3755 debian/control.stub | 6 +++--- debian/rules | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/control.stub b/debian/control.stub index a4b98d6..b998763 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -13,7 +13,7 @@ Build-Depends-Arch: Standards-Version: 3.9.4 Package: linux-image-ABI-generic -Architecture: amd64 arm64 ppc64el +Architecture: amd64 arm64 ppc64el s390x Depends: ${unsigned:Depends} Recommends: ${unsigned:Recommends} Suggests: ${unsigned:Suggests} @@ -41,7 +41,7 @@ Package-Type: udeb Section: debian-installer Priority: extra Provides: kernel-signed-image -Architecture: amd64 arm64 ppc64el +Architecture: amd64 arm64 ppc64el s390x Built-Using: UNSIGNED_SRC_PACKAGE (= UNSIGNED_SRC_VERSION) Description: Signed kernel image generic for the Debian installer A kernel image for generic. This version of it is signed with @@ -50,7 +50,7 @@ Description: Signed kernel image generic for the Debian installer Package: linux-image-ABI-generic-dbgsym Section: devel -Architecture: amd64 arm64 ppc64el +Architecture: amd64 arm64 ppc64el s390x Depends: linux-image-unsigned-ABI-generic-dbgsym Description: Signed kernel image generic A link to the debugging symbols for the generic signed kernel. diff --git a/debian/rules b/debian/rules index 69f2678..7541a54 100755 --- a/debian/rules +++ b/debian/rules @@ -60,7 +60,13 @@ override_dh_auto_build: [ ! -f "$$s" ] && continue; \ chmod 600 "$$s"; \ base=$$(echo "$$s" | sed -e 's/.opal.sig//'); \ - cat "$$base.opal" "$$s" >"../SIGNED/$$base";\ + cat "$$base.opal" "$$s" >"../SIGNED/$$base"; \ + done; \ + for s in *.sipl.sig; do \ + [ ! -f "$$s" ] && continue; \ + chmod 600 "$$s"; \ + base=$$(echo "$$s" | sed -e 's/.sipl.sig//'); \ + cat "$$base.sipl" "$$s" >"../SIGNED/$$base"; \ done \ )