From patchwork Fri Jun 26 12:30:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317621 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpk2PtGz9sRW for ; Fri, 26 Jun 2020 22:31:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D60B885EB8; Fri, 26 Jun 2020 12:31:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CfqMb_4FhbXf; Fri, 26 Jun 2020 12:31:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 31BD485F35; Fri, 26 Jun 2020 12:31:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id A5ADC1BF989 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A2B0A85DCF for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4f6AjLLJyPVO for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b03.edpnet.be (relay-b03.edpnet.be [212.71.1.220]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 1000085EB8 for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a8818764e49fcd0001-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b03.edpnet.be with ESMTP id FSaOugUz9pigm4Ik for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id 7D2B2F71F97; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:48 +0200 X-ASG-Orig-Subj: [PATCH 1/6] Revert "python-m2crypto: remove" Message-Id: <20200626123053.30626-2-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.220:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 2504 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.6871 1.0000 1.2731 X-Barracuda-Spam-Score: 1.77 X-Barracuda-Spam-Status: No, SCORE=1.77 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M Subject: [Buildroot] [PATCH 1/6] Revert "python-m2crypto: remove" X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This reverts commit 484c04878e5e76cdc0cc33c7646f98ab41698a7e. python-m2crypto becomes needed for recompiling wireless-regdb. Signed-off-by: Kurt Van Dijck --- package/python-m2crypto/python-m2crypto.hash | 3 ++ package/python-m2crypto/python-m2crypto.mk | 31 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 package/python-m2crypto/python-m2crypto.hash create mode 100644 package/python-m2crypto/python-m2crypto.mk diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash new file mode 100644 index 0000000000..4ac180f870 --- /dev/null +++ b/package/python-m2crypto/python-m2crypto.hash @@ -0,0 +1,3 @@ +# md5 from https://pypi.python.org/pypi/M2Crypto/, sha256 locally computed +md5 8e87235942c76d1ba9f999ee33764fdb M2Crypto-0.24.0.tar.gz +sha256 80a56441a1d2c0cf27e725be7554c92598b938fc8767ee2c71fdbc2fdc055ee8 M2Crypto-0.24.0.tar.gz diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk new file mode 100644 index 0000000000..3d0e54eb4e --- /dev/null +++ b/package/python-m2crypto/python-m2crypto.mk @@ -0,0 +1,31 @@ +################################################################################ +# +# python-m2crypto +# +################################################################################ + +PYTHON_M2CRYPTO_VERSION = 0.24.0 +PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto +PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz +PYTHON_M2CRYPTO_SETUP_TYPE = setuptools +HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig + +PYTHON_M2CRYPTO_LICENSE = MIT +PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE + +# We need to use python2 because m2crypto is not python3 compliant. +HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2 + +# The --openssl option that allows to specify a custom path to OpenSSL +# can only be used with the non-default build_ext setup.py command, +# and calling this command directly fails. To work around this, simply +# hardcode the path to OpenSSL in setup.py. +# Bug reported at https://gitlab.com/m2crypto/m2crypto/issues/89 +define HOST_PYTHON_M2CRYPTO_SET_OPENSSL_PATH + $(SED) "s%self.openssl = '/usr'%self.openssl = '$(HOST_DIR)/usr'%" \ + $(@D)/setup.py +endef + +HOST_PYTHON_M2CRYPTO_POST_PATCH_HOOKS += HOST_PYTHON_M2CRYPTO_SET_OPENSSL_PATH + +$(eval $(host-python-package)) From patchwork Fri Jun 26 12:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317620 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpj5qL2z9sRN for ; Fri, 26 Jun 2020 22:31:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 5CD7288564; Fri, 26 Jun 2020 12:31:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f12Q+vyX4LZn; Fri, 26 Jun 2020 12:31:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 670038874A; Fri, 26 Jun 2020 12:31:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 277A81BF339 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1C897204B6 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8jeuvaFjgTBR for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b01.edpnet.be (relay-b01.edpnet.be [212.71.1.221]) by silver.osuosl.org (Postfix) with ESMTPS id C5B9520117 for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a7ff53cab3eb810001-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b01.edpnet.be with ESMTP id nHbBqlhulazOm6yA for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id 87308F71F9A; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:49 +0200 X-ASG-Orig-Subj: [PATCH 2/6] python-m2crypto: bump version Message-Id: <20200626123053.30626-3-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.221:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 2621 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.5373 1.0000 0.7500 X-Barracuda-Spam-Score: 1.25 X-Barracuda-Spam-Status: No, SCORE=1.25 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M Subject: [Buildroot] [PATCH 2/6] python-m2crypto: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Kurt Van Dijck --- package/python-m2crypto/python-m2crypto.hash | 5 ++--- package/python-m2crypto/python-m2crypto.mk | 16 +++------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python-m2crypto/python-m2crypto.hash index 4ac180f870..91a6f722ca 100644 --- a/package/python-m2crypto/python-m2crypto.hash +++ b/package/python-m2crypto/python-m2crypto.hash @@ -1,3 +1,2 @@ -# md5 from https://pypi.python.org/pypi/M2Crypto/, sha256 locally computed -md5 8e87235942c76d1ba9f999ee33764fdb M2Crypto-0.24.0.tar.gz -sha256 80a56441a1d2c0cf27e725be7554c92598b938fc8767ee2c71fdbc2fdc055ee8 M2Crypto-0.24.0.tar.gz +# sha256 locally computed +sha256 4c6ad45ffb88670c590233683074f2440d96aaccb05b831371869fc387cbd127 M2Crypto-0.35.2.tar.gz diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk index 3d0e54eb4e..b98a2f4040 100644 --- a/package/python-m2crypto/python-m2crypto.mk +++ b/package/python-m2crypto/python-m2crypto.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_M2CRYPTO_VERSION = 0.24.0 -PYTHON_M2CRYPTO_SITE = http://pypi.python.org/packages/source/M/M2Crypto +PYTHON_M2CRYPTO_VERSION = 0.35.2 +PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/74/18/3beedd4ac48b52d1a4d12f2a8c5cf0ae342ce974859fba838cbbc1580249 PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz PYTHON_M2CRYPTO_SETUP_TYPE = setuptools HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig @@ -13,19 +13,9 @@ HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig PYTHON_M2CRYPTO_LICENSE = MIT PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE -# We need to use python2 because m2crypto is not python3 compliant. HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2 -# The --openssl option that allows to specify a custom path to OpenSSL -# can only be used with the non-default build_ext setup.py command, -# and calling this command directly fails. To work around this, simply -# hardcode the path to OpenSSL in setup.py. -# Bug reported at https://gitlab.com/m2crypto/m2crypto/issues/89 -define HOST_PYTHON_M2CRYPTO_SET_OPENSSL_PATH - $(SED) "s%self.openssl = '/usr'%self.openssl = '$(HOST_DIR)/usr'%" \ - $(@D)/setup.py -endef -HOST_PYTHON_M2CRYPTO_POST_PATCH_HOOKS += HOST_PYTHON_M2CRYPTO_SET_OPENSSL_PATH +HOST_PYTHON_M2CRYPTO_BUILD_OPTS = --openssl $(HOST_DIR) $(eval $(host-python-package)) From patchwork Fri Jun 26 12:30:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317618 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpj2R77z9sPF for ; Fri, 26 Jun 2020 22:31:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E244F8854C; Fri, 26 Jun 2020 12:31:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gRlnFri+6NoY; Fri, 26 Jun 2020 12:31:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 22C7288538; Fri, 26 Jun 2020 12:31:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B86831BF339 for ; Fri, 26 Jun 2020 12:31:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B299786119 for ; Fri, 26 Jun 2020 12:31:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 06ie7FHVVaht for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b03.edpnet.be (relay-b03.edpnet.be [212.71.1.220]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 01CBE86CFC for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a8818764d4a1380001-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b03.edpnet.be with ESMTP id z3JUcPn74cSxGOH0 for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id 90B04F71F9C; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:50 +0200 X-ASG-Orig-Subj: [PATCH 3/6] python3-m2crypto: move from python-m2crypto Message-Id: <20200626123053.30626-4-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.220:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 2902 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.2369 1.0000 -0.6394 X-Barracuda-Spam-Score: -0.64 X-Barracuda-Spam-Status: No, SCORE=-0.64 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Subject: [Buildroot] [PATCH 3/6] python3-m2crypto: move from python-m2crypto X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" wireless-regdb does not compile using python2. Signed-off-by: Kurt Van Dijck --- package/python-m2crypto/python-m2crypto.mk | 21 ------------------- .../python3-m2crypto.hash} | 0 package/python3-m2crypto/python3-m2crypto.mk | 21 +++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) delete mode 100644 package/python-m2crypto/python-m2crypto.mk rename package/{python-m2crypto/python-m2crypto.hash => python3-m2crypto/python3-m2crypto.hash} (100%) create mode 100644 package/python3-m2crypto/python3-m2crypto.mk diff --git a/package/python-m2crypto/python-m2crypto.mk b/package/python-m2crypto/python-m2crypto.mk deleted file mode 100644 index b98a2f4040..0000000000 --- a/package/python-m2crypto/python-m2crypto.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# python-m2crypto -# -################################################################################ - -PYTHON_M2CRYPTO_VERSION = 0.35.2 -PYTHON_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/74/18/3beedd4ac48b52d1a4d12f2a8c5cf0ae342ce974859fba838cbbc1580249 -PYTHON_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON_M2CRYPTO_VERSION).tar.gz -PYTHON_M2CRYPTO_SETUP_TYPE = setuptools -HOST_PYTHON_M2CRYPTO_DEPENDENCIES = host-openssl host-swig - -PYTHON_M2CRYPTO_LICENSE = MIT -PYTHON_M2CRYPTO_LICENSE_FILES = LICENCE - -HOST_PYTHON_M2CRYPTO_NEEDS_HOST_PYTHON = python2 - - -HOST_PYTHON_M2CRYPTO_BUILD_OPTS = --openssl $(HOST_DIR) - -$(eval $(host-python-package)) diff --git a/package/python-m2crypto/python-m2crypto.hash b/package/python3-m2crypto/python3-m2crypto.hash similarity index 100% rename from package/python-m2crypto/python-m2crypto.hash rename to package/python3-m2crypto/python3-m2crypto.hash diff --git a/package/python3-m2crypto/python3-m2crypto.mk b/package/python3-m2crypto/python3-m2crypto.mk new file mode 100644 index 0000000000..17b36fa9aa --- /dev/null +++ b/package/python3-m2crypto/python3-m2crypto.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# python3-m2crypto +# +################################################################################ + +PYTHON3_M2CRYPTO_VERSION = 0.35.2 +PYTHON3_M2CRYPTO_SITE = https://files.pythonhosted.org/packages/74/18/3beedd4ac48b52d1a4d12f2a8c5cf0ae342ce974859fba838cbbc1580249 +PYTHON3_M2CRYPTO_SOURCE = M2Crypto-$(PYTHON3_M2CRYPTO_VERSION).tar.gz +PYTHON3_M2CRYPTO_SETUP_TYPE = setuptools +HOST_PYTHON3_M2CRYPTO_DEPENDENCIES = host-openssl host-swig + +PYTHON3_M2CRYPTO_LICENSE = MIT +PYTHON3_M2CRYPTO_LICENSE_FILES = LICENCE + +HOST_PYTHON3_M2CRYPTO_NEEDS_HOST_PYTHON = python3 + + +HOST_PYTHON3_M2CRYPTO_BUILD_OPTS = --openssl $(HOST_DIR) + +$(eval $(host-python-package)) From patchwork Fri Jun 26 12:30:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317617 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpd0qcyz9sPF for ; Fri, 26 Jun 2020 22:31:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D22E687D22; Fri, 26 Jun 2020 12:31:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HBgpWsKojFjj; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A3B8D86DF4; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 0D72E1BF989 for ; Fri, 26 Jun 2020 12:31:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0623B8851B for ; Fri, 26 Jun 2020 12:31:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wRhg1U5KeoYG for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b01.edpnet.be (relay-b01.edpnet.be [212.71.1.221]) by hemlock.osuosl.org (Postfix) with ESMTPS id 7ABDF87E9E for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a7ff53caa3eb5e0001-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b01.edpnet.be with ESMTP id 0i8BGCp7h8pHTLtS for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id 9A6D1F71F9E; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:51 +0200 X-ASG-Orig-Subj: [PATCH 4/6] wireless-regdb: add option to rebuild Message-Id: <20200626123053.30626-5-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.221:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 2717 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.7751 1.0000 1.9928 X-Barracuda-Spam-Score: 1.99 X-Barracuda-Spam-Status: No, SCORE=1.99 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- Subject: [Buildroot] [PATCH 4/6] wireless-regdb: add option to rebuild X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In some countries, different regulations apply for indoor and outdoor use. The precompiled binary of wireless-regdb is for indoor use only. If your product is for outdoor use, or for other deviations, you may need to rebuild the patched or modified wireless-regdb. Building is done explicitely using python3 Signed-off-by: Kurt Van Dijck --- package/wireless-regdb/Config.in | 15 +++++++++++++++ package/wireless-regdb/wireless-regdb.mk | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/package/wireless-regdb/Config.in b/package/wireless-regdb/Config.in index 17350a41d8..55347b5e8c 100644 --- a/package/wireless-regdb/Config.in +++ b/package/wireless-regdb/Config.in @@ -12,3 +12,18 @@ config BR2_PACKAGE_WIRELESS_REGDB application is needed. https://wireless.wiki.kernel.org/en/developers/regulatory/wireless-regdb + +if BR2_PACKAGE_WIRELESS_REGDB + +config BR2_WIRELESS_REGDB_REBUILD + bool "rebuild wireless-regdb" + help + Say no to use the pre-built wireless regdb. + + Say yes if you need to deploy a modified wireless-regdb. + Deviations to the precompiled upstream wireless-regdb may be required + e.g. if you plan to deploy your product outdoor in countries where + outdoor and indoor regulations differ. + Make sure to deploy your wireless-regdb public key if you use crda + or compile them into the kernel. +endif diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 31b62e36e1..7c6b140a4a 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -10,12 +10,30 @@ WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb WIRELESS_REGDB_LICENSE = ISC WIRELESS_REGDB_LICENSE_FILES = LICENSE + +ifeq ($(BR2_WIRELESS_REGDB_REBUILD),y) + +define WIRELESS_REGDB_PATCH_PYTHON3 + sed -i -e '1 s/python$$/python3/' $(@D)/*.py +endef + +WIRELESS_REGDB_POST_PATCH_HOOKS += WIRELESS_REGDB_PATCH_PYTHON3 + +WIRELESS_REGDB_DEPENDENCIES += host-python3-m2crypto +define WIRELESS_REGDB_BUILD_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ + REGDB_AUTHOR=buildroot +endef +endif + ifeq ($(BR2_PACKAGE_CRDA),y) define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS $(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \ $(TARGET_DIR)/usr/lib/crda/regulatory.bin $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ $(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem + $(INSTALL) -m 644 -D -T ~/.wireless-regdb-buildroot.key.pub.pem \ + $(TARGET_DIR)/etc/wireless-regdb/pubkeys/buildroot.key.pub.pem endef endif From patchwork Fri Jun 26 12:30:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317616 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpb0yb3z9sRN for ; Fri, 26 Jun 2020 22:31:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0F8E420117; Fri, 26 Jun 2020 12:31:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gSHH9kE0uPd4; Fri, 26 Jun 2020 12:31:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A7886204B6; Fri, 26 Jun 2020 12:31:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 31A8D1BF9B6 for ; Fri, 26 Jun 2020 12:31:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2CCC486DAF for ; Fri, 26 Jun 2020 12:31:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I2UqiPIOXtrA for ; Fri, 26 Jun 2020 12:31:12 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b03.edpnet.be (relay-b03.edpnet.be [212.71.1.220]) by whitealder.osuosl.org (Postfix) with ESMTPS id CC37F877D1 for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a8818764f4a0a30002-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b03.edpnet.be with ESMTP id 9xLns2QFswOaZ4ZJ for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id A1EE8F71FA0; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:52 +0200 X-ASG-Orig-Subj: [PATCH 5/6] wireless-regdb: add explicit signing key config Message-Id: <20200626123053.30626-6-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.220:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 3217 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.4007 1.0000 0.0000 X-Barracuda-Spam-Score: 0.50 X-Barracuda-Spam-Status: No, SCORE=0.50 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M Subject: [Buildroot] [PATCH 5/6] wireless-regdb: add explicit signing key config X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This commit allows to set an explicit file with signing key to use. Signed-off-by: Kurt Van Dijck --- package/wireless-regdb/Config.in | 18 ++++++++++++++++++ package/wireless-regdb/wireless-regdb.mk | 24 +++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/package/wireless-regdb/Config.in b/package/wireless-regdb/Config.in index 55347b5e8c..be2c421438 100644 --- a/package/wireless-regdb/Config.in +++ b/package/wireless-regdb/Config.in @@ -26,4 +26,22 @@ config BR2_WIRELESS_REGDB_REBUILD outdoor and indoor regulations differ. Make sure to deploy your wireless-regdb public key if you use crda or compile them into the kernel. + +if BR2_WIRELESS_REGDB_REBUILD + +config BR2_WIRELESS_REGDB_COMMONNAME + string "CommonName for x509 cert" + default "buildroot" + +config BR2_WIRELESS_REGDB_PRIVKEY + string "private key for signing wireless-regdb" + default "~/.buildroot" + help + Path to file containing private key to sign wireless-regdb. + The key should be in .pem format. + + If the file does not exist, a new key will be generated + +endif + endif diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index 7c6b140a4a..af54d2c0f4 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -13,16 +13,34 @@ WIRELESS_REGDB_LICENSE_FILES = LICENSE ifeq ($(BR2_WIRELESS_REGDB_REBUILD),y) +WIRELESS_REGDB_PRIVKEY = $(call qstrip,$(BR2_WIRELESS_REGDB_PRIVKEY)) +# make sure PRIVKEYNAME is set +ifeq ($(WIRELESS_REGDB_PRIVKEYNAME),) +WIRELESS_REGDB_PRIVKEY=~/.buildroot +endif +WIRELESS_REGDB_PRIVKEYNAME = $(patsubst .%,%,$(notdir $(WIRELESS_REGDB_PRIVKEY))) + +ifeq ($(call qstrip,$(BR2_WIRELESS_REGDB_COMMONNAME)),) +BR2_WIRELESS_REGDB_COMMONNAME = "buildroot" +endif + define WIRELESS_REGDB_PATCH_PYTHON3 sed -i -e '1 s/python$$/python3/' $(@D)/*.py + sed -i -e 's/= sforshee$$/= $(call qstrip,$(BR2_WIRELESS_REGDB_COMMONNAME))/' $(@D)/gen-pubcert.sh endef WIRELESS_REGDB_POST_PATCH_HOOKS += WIRELESS_REGDB_PATCH_PYTHON3 WIRELESS_REGDB_DEPENDENCIES += host-python3-m2crypto + define WIRELESS_REGDB_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - REGDB_AUTHOR=buildroot + REGDB_PRIVKEY=$(WIRELESS_REGDB_PRIVKEY) \ + REGDB_PUBKEY=$(WIRELESS_REGDB_PRIVKEYNAME).pub \ + REGDB_PUBCERT=$(WIRELESS_REGDB_PRIVKEYNAME).x509.pem + openssl x509 -in $(@D)/$(WIRELESS_REGDB_PRIVKEYNAME).x509.pem \ + -outform DER \ + -out $(@D)/$(WIRELESS_REGDB_PRIVKEYNAME).x509 endef endif @@ -32,8 +50,8 @@ define WIRELESS_REGDB_INSTALL_CRDA_TARGET_CMDS $(TARGET_DIR)/usr/lib/crda/regulatory.bin $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ $(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem - $(INSTALL) -m 644 -D -T ~/.wireless-regdb-buildroot.key.pub.pem \ - $(TARGET_DIR)/etc/wireless-regdb/pubkeys/buildroot.key.pub.pem + $(INSTALL) -m 644 -D -T $(@D)/$(WIRELESS_REGDB_PRIVKEYNAME).pub \ + $(TARGET_DIR)/etc/wireless-regdb/pubkeys/$(WIRELESS_REGDB_PRIVKEYNAME).pub endef endif From patchwork Fri Jun 26 12:30:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kurt Van Dijck X-Patchwork-Id: 1317619 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vandijck-laurijssen.be Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tbpk09Ghz9sRR for ; Fri, 26 Jun 2020 22:31:26 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7BCA286E89; Fri, 26 Jun 2020 12:31:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E9dw6mR29DSn; Fri, 26 Jun 2020 12:31:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 449D3877D1; Fri, 26 Jun 2020 12:31:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8030E1BF339 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75AD0877D1 for ; Fri, 26 Jun 2020 12:31:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S8P05eDMzTaN for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from relay-b03.edpnet.be (relay-b03.edpnet.be [212.71.1.220]) by whitealder.osuosl.org (Postfix) with ESMTPS id BA8E886DF4 for ; Fri, 26 Jun 2020 12:31:11 +0000 (UTC) X-ASG-Debug-ID: 1593174668-0a8818764c4a1250001-rUBnyj Received: from zotac.vandijck-laurijssen.be (77.109.122.82.adsl.dyn.edpnet.net [77.109.122.82]) by relay-b03.edpnet.be with ESMTP id o6gInDmv0YCCoHdr for ; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) X-Barracuda-Envelope-From: dev.kurt@vandijck-laurijssen.be X-Barracuda-Effective-Source-IP: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Apparent-Source-IP: 77.109.122.82 Received: from x1.vandijck-laurijssen.be (x1.vandijck-laurijssen.be [192.168.0.36]) by zotac.vandijck-laurijssen.be (Postfix) with ESMTPSA id AB116F71FA2; Fri, 26 Jun 2020 14:31:08 +0200 (CEST) From: Kurt Van Dijck To: buildroot@buildroot.org Date: Fri, 26 Jun 2020 14:30:53 +0200 X-ASG-Orig-Subj: [PATCH 6/6] wireless-regdb: add signing key to linux kernel Message-Id: <20200626123053.30626-7-dev.kurt@vandijck-laurijssen.be> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> References: <20200626123053.30626-1-dev.kurt@vandijck-laurijssen.be> MIME-Version: 1.0 X-Barracuda-Connect: 77.109.122.82.adsl.dyn.edpnet.net[77.109.122.82] X-Barracuda-Start-Time: 1593174668 X-Barracuda-URL: https://212.71.1.220:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at edpnet.be X-Barracuda-Scan-Msg-Size: 1781 X-Barracuda-BRTS-Status: 1 X-Barracuda-Bayes: INNOCENT GLOBAL 0.7192 1.0000 1.5183 X-Barracuda-Spam-Score: 2.02 X-Barracuda-Spam-Status: No, SCORE=2.02 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=7.0 tests=BSF_RULE7568M X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.82819 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.50 BSF_RULE7568M Custom Rule 7568M Subject: [Buildroot] [PATCH 6/6] wireless-regdb: add signing key to linux kernel X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kurt Van Dijck Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" When rebuilding wireless-regdb, linux kernel needs the signing public key to validate the database. Signed-off-by: Kurt Van Dijck --- linux/linux.mk | 4 ++++ package/wireless-regdb/wireless-regdb.mk | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/linux/linux.mk b/linux/linux.mk index b9f2052ee7..8366afaa03 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -367,6 +367,10 @@ define LINUX_KCONFIG_FIXUP_CMDS $(PACKAGES_LINUX_CONFIG_FIXUPS) endef +ifeq ($(BR2_WIRELESS_REGDB_REBUILD),y) +LINUX_DEPENDENCIES += wireless-regdb +endif + ifeq ($(BR2_LINUX_KERNEL_DTS_SUPPORT),y) # Starting with 4.17, the generated dtc parser code is no longer # shipped with the kernel sources, so we need flex and bison. For diff --git a/package/wireless-regdb/wireless-regdb.mk b/package/wireless-regdb/wireless-regdb.mk index af54d2c0f4..2401342695 100644 --- a/package/wireless-regdb/wireless-regdb.mk +++ b/package/wireless-regdb/wireless-regdb.mk @@ -42,6 +42,20 @@ define WIRELESS_REGDB_BUILD_CMDS -outform DER \ -out $(@D)/$(WIRELESS_REGDB_PRIVKEYNAME).x509 endef + +# Sarting with 4.15, the kernel can hold public keys for validating +# regulatory.db file. +# make sure wireless-regdb is rebuilt before linux +# and fixup kernel to include the signing key + +define WIRELESS_REGDB_LINUX_FIXUP + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211_CERTIFICATION_ONUS) + $(call KCONFIG_ENABLE_OPT,CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS) + $(call KCONFIG_SET_OPT,CONFIG_CFG80211_EXTRA_REGDB_KEYDIR,"$(WIRELESS_REGDB_DIR)") +endef + +PACKAGES_LINUX_CONFIG_FIXUPS += $(call WIRELESS_REGDB_LINUX_FIXUP) + endif ifeq ($(BR2_PACKAGE_CRDA),y)