From patchwork Fri Jan 2 08:22:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stijn Tintel X-Patchwork-Id: 424955 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6B5431400B7 for ; Fri, 2 Jan 2015 19:24:45 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 652CA28BDC2; Fri, 2 Jan 2015 09:21:50 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B935828BC40 for ; Fri, 2 Jan 2015 09:21:03 +0100 (CET) X-policyd-weight: using cached result; rate:hard: -7.6 Received: from mail.tintel.eu (mail.tintel.eu [62.213.201.86]) by arrakis.dune.hu (Postfix) with ESMTP for ; Fri, 2 Jan 2015 09:21:01 +0100 (CET) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id AE8D12A51C8 for ; Fri, 2 Jan 2015 09:23:00 +0100 (CET) Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10032) with ESMTP id 2jpCpVIayWPx for ; Fri, 2 Jan 2015 09:22:47 +0100 (CET) Received: from localhost (localhost [IPv6:::1]) by mail.tintel.eu (Postfix) with ESMTP id 80EDF2A51CB for ; Fri, 2 Jan 2015 09:22:47 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.tintel.eu Received: from mail.tintel.eu ([IPv6:::1]) by localhost (mail.tintel.eu [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id SGsa2C4AZ_GI for ; Fri, 2 Jan 2015 09:22:47 +0100 (CET) Received: from taz.st-esk.be.tintel.eu (unknown [IPv6:2a02:1811:80:50:12bf:48ff:fed5:44b8]) by mail.tintel.eu (Postfix) with SMTP id 5E2762A51C8 for ; Fri, 2 Jan 2015 09:22:46 +0100 (CET) Received: by taz.st-esk.be.tintel.eu (sSMTP sendmail emulation); Fri, 02 Jan 2015 09:22:47 +0100 From: Stijn Tintel To: openwrt-devel@lists.openwrt.org Date: Fri, 2 Jan 2015 09:22:36 +0100 Message-Id: <1420186962-23268-5-git-send-email-stijn@linux-ipv6.be> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1420186962-23268-1-git-send-email-stijn@linux-ipv6.be> References: <1420186962-23268-1-git-send-email-stijn@linux-ipv6.be> Subject: [OpenWrt-Devel] [PATCH 04/10] kernel/modules: remove CRYPTOMGR_MODULES X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Stijn Tintel --- package/kernel/linux/modules/crypto.mk | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index d17f1e1..04903c3 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -11,9 +11,6 @@ CRYPTO_MODULES = \ ALGAPI2=crypto_algapi \ BLKCIPHER2=crypto_blkcipher -CRYPTOMGR_MODULES = \ - MANAGER2=cryptomgr - crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1))) crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1)))) @@ -67,8 +64,8 @@ define KernelPackage/crypto-manager DEPENDS:=+kmod-crypto-aead +kmod-crypto-hash +kmod-crypto-pcompress KCONFIG:= \ CONFIG_CRYPTO_MANAGER \ - $(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_confvar,$(mod))) - FILES:=$(foreach mod,$(CRYPTOMGR_MODULES),$(call crypto_file,$(mod))) + CONFIG_CRYPTO_MANAGER2 + FILES:=$(LINUX_DIR)/crypto/cryptomgr.ko $(call AddDepends/crypto) endef