From patchwork Fri Mar 20 23:39:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 11450583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C34731864 for ; Fri, 20 Mar 2020 23:40:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2C6B20752 for ; Fri, 20 Mar 2020 23:40:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726880AbgCTXkQ (ORCPT ); Fri, 20 Mar 2020 19:40:16 -0400 Received: from mout-p-103.mailbox.org ([80.241.56.161]:8216 "EHLO mout-p-103.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726867AbgCTXkQ (ORCPT ); Fri, 20 Mar 2020 19:40:16 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 48kgHf4R8czKmTh; Sat, 21 Mar 2020 00:40:14 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id ebEqFekY5bVm; Sat, 21 Mar 2020 00:40:12 +0100 (CET) From: Hauke Mehrtens To: backports@vger.kernel.org Cc: johannes@sipsolutions.net, Hauke Mehrtens Subject: [PATCH 7/8] backports: Do not build BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION on < 3.13 Date: Sat, 21 Mar 2020 00:39:49 +0100 Message-Id: <20200320233950.32257-8-hauke@hauke-m.de> In-Reply-To: <20200320233950.32257-1-hauke@hauke-m.de> References: <20200320233950.32257-1-hauke@hauke-m.de> MIME-Version: 1.0 Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org SYSTEM_DATA_VERIFICATION now uses hash_algo_name() which was added in kernel 3.13. Just do not build this on older kernel versions. Signed-off-by: Hauke Mehrtens --- backport/compat/Kconfig | 1 + dependencies | 3 +++ 2 files changed, 4 insertions(+) diff --git a/backport/compat/Kconfig b/backport/compat/Kconfig index 3af729a3..41b50a6b 100644 --- a/backport/compat/Kconfig +++ b/backport/compat/Kconfig @@ -150,6 +150,7 @@ config BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION bool default y if BPAUTO_SYSTEM_DATA_VERIFICATION depends on KERNEL_4_7 || !SYSTEM_DATA_VERIFICATION + depends on !KERNEL_3_13 select BPAUTO_ASN1_DECODER select BPAUTO_PUBLIC_KEY select BPAUTO_PKCS7 diff --git a/dependencies b/dependencies index 47558470..cb6741c7 100644 --- a/dependencies +++ b/dependencies @@ -89,3 +89,6 @@ R8188EU 3.14 # depends on crypto_sync_skcipher() AIRO 4.20 AIRO_CS 4.20 + +# needs BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION +CFG80211_REQUIRE_SIGNED_REGDB 3_13