From patchwork Tue Jul 16 00:02:04 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: 1132349 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="XRwmHdf/"; 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 45ngZR48dhz9sBt; Tue, 16 Jul 2019 10:02:37 +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 1hnAvN-0001ea-Tw; Tue, 16 Jul 2019 00:02:29 +0000 Received: from mail-wm1-f65.google.com ([209.85.128.65]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1hnAvM-0001eU-BF for kernel-team@lists.ubuntu.com; Tue, 16 Jul 2019 00:02:28 +0000 Received: by mail-wm1-f65.google.com with SMTP id x15so16827093wmj.3 for ; Mon, 15 Jul 2019 17:02:28 -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=6ENvFgn6TTz4aEV5Y0CxQ6tH0ypIcQXcNrHBPiBn4jE=; b=XRwmHdf/V6M4IaNkTFZV+H7n0VPtmgO2vOU9aXYjnf1P85QwRCxSwwm3mwGJZm2bhG sMf1Mujts+3+yFxBIdi3YXQRk8rqXru317S72FV2e0shC1Kip2a9h5pZZLZLto9bawUP aMsixqQdixJCY/A5ZCTIWKWPx1/5XeUPjVOps= 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=6ENvFgn6TTz4aEV5Y0CxQ6tH0ypIcQXcNrHBPiBn4jE=; b=Xd+13EHfFZvxwMQ4HHRN2LoCPno4QqOo6ZzM/ZvZlpA2dDbwS5kVHgF/bSa4QpJYHS v6U++xy2Y0WOqSoqTpgmgbNGJHRmZzhTJgYn+NQzQEwfx3fUSKmHwJru9kycYVFFnxWc U0eaRm+TmbttIs6B7BlhxnyNHIfpLeISzrVdaeNAVL4jktIia07u+QQm2EvZhEudGL6y yz5bQyduGBcJ5QmNATMcnE9MnswQQ79+eSs3v+lxy6u60OkSHQsMytfZ1Bk5Ty5/S4LZ YgVfCJGLGhZtjvT3imPeAc94vozusvwoyQs6HcU3mc1IXQIFfHNuIMd5MfeiQ9oSI3uj n6iQ== X-Gm-Message-State: APjAAAWkOnosev75h6FA1S8elUBlPxlK1OhLrkM6jtHorX2z2lAJ2mHH 9EPLvl4VJshdF0Pq8ChooixbYVeZ X-Google-Smtp-Source: APXvYqw7rkZMklhqo+e35mpliY4ni3xpEATiEP9SQYjKEYJ8ix9cfWzKPWoDUJ00zbyaKldWzxyafg== X-Received: by 2002:a7b:c1da:: with SMTP id a26mr26619855wmj.128.1563235347486; Mon, 15 Jul 2019 17:02:27 -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 o6sm35303433wra.27.2019.07.15.17.02.26 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 15 Jul 2019 17:02:26 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [PATCH][EOAN] UBUNTU: [Config] enable secureboot signing on s390x Date: Tue, 16 Jul 2019 01:02:04 +0100 Message-Id: <20190716000203.15174-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 --- debian.master/rules.d/s390x.mk | 2 +- debian/rules | 2 +- debian/rules.d/1-maintainer.mk | 1 + debian/rules.d/2-binary-arch.mk | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian.master/rules.d/s390x.mk b/debian.master/rules.d/s390x.mk index dad66b1a674f..14e58db17d27 100644 --- a/debian.master/rules.d/s390x.mk +++ b/debian.master/rules.d/s390x.mk @@ -11,7 +11,7 @@ vdso = vdso_install no_dumpfile = true do_extras_package = true - +sipl_signed = true do_tools_usbip = true do_tools_cpupower = true do_tools_perf = true diff --git a/debian/rules b/debian/rules index 0953195f5ab1..80205f30b265 100755 --- a/debian/rules +++ b/debian/rules @@ -49,7 +49,7 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) endif # Are any of the kernel signing options enabled. -any_signed=$(sort $(filter-out false,$(uefi_signed) $(opal_signed))) +any_signed=$(sort $(filter-out false,$(uefi_signed) $(opal_signed) $(sipl_signed))) ifeq ($(any_signed),true) bin_pkg_name=$(bin_pkg_name_unsigned) else diff --git a/debian/rules.d/1-maintainer.mk b/debian/rules.d/1-maintainer.mk index e71bf3c281ef..efc5e50841c9 100644 --- a/debian/rules.d/1-maintainer.mk +++ b/debian/rules.d/1-maintainer.mk @@ -92,6 +92,7 @@ printenv: @echo "any_signed = $(any_signed)" @echo " uefi_signed = $(uefi_signed)" @echo " opal_signed = $(opal_signed)" + @echo " sipl_signed = $(sipl_signed)" @echo "full_build = $(full_build)" @echo "libc_dev_version = $(libc_dev_version)" @echo "DEB_HOST_GNU_TYPE = $(DEB_HOST_GNU_TYPE)" diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index f3ab06748cf6..083b64772439 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -151,6 +151,11 @@ ifeq ($(opal_signed),true) cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ $(signingv)/$(instfile)-$(abi_release)-$*.opal; endif +ifeq ($(sipl_signed),true) + install -d $(signingv) + cp -p $(pkgdir_bin)/boot/$(instfile)-$(abi_release)-$* \ + $(signingv)/$(instfile)-$(abi_release)-$*.sipl; +endif install -d $(pkgdir)/boot install -m644 $(builddir)/build-$*/.config \