[From nobody Thu Jun 25 05:55:08 2020 Received: from sonic315-21.consmr.mail.ne1.yahoo.com ([66.163.190.147]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJjy6-0000QW-AE for openwrt-devel@lists.openwrt.org; Thu, 25 Apr 2019 19:23:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1556220217; bh=f//rrv9HxH4CCwvMEvJpcNLTVrk9FSoPgBg5pHQ44kk=; h=From:To:Cc:Subject:Date:From:Subject; b=TGjO5MOpJ88k4+iAiy1w0nbBN1aPObAnxcC1EYqR2WRbJ7O+1UPk5rmHP/18SHuwqxjwm99WOFn0Denj9xaWfkrZGD7wXRr+6RYoglZigA3DlXSXwca1fPhktykkPSOODqF+EbNpFV4Y2IA0+NU7KhkfExhesMx18fOJYkEHGgP/phWTuQLLpbgW9zwpw91Q33no5CccG6A8wMwO4d0q35aHxgiV6hEuDuWV69Fph8tl1OFBIYZQbR454evbOLoPK16s/7wVhhPVB5V7NGFeklAkDpv2YybZsfOxEWEs1HE/V6ESNq5E6Z+4OL8C8lWKFNNzmnSJdpdnrnPnXVo7jQ== X-YMail-OSG: XbBesP0VM1nHWeBDB.RyamTC6Ed15V4ZwGdlAKWoP.6vEPEC62XWtQ.xwH6e.RA H0r6x2DxAtG4KyoAhTsB5sDXGUlS0Z3IHRvg2hplC2ZWDTtZ8ez_oRBvT62ORwTRt_Li8.2IcTfy _fFr._Dg1lES2ABYyEyMvr.Hysi9Yd2NUnq9LnZ1MCJX89zE7MlO3OFKnkH.bXwx4goxvsjtW1yK IfF6LWeJJqxH5buCWWQgOK1xM.oVmf_dYv0e1kgFeGwym3PynD.mT.GR8zMxr5iAHME64HYTflU2 cOrUgrourvj.UgIyYgu3ixNrUIW9ea7P0B.Nfr_aBURG0_x0GdP8dONASI4PNeHt5xeqEjxgYY7M D0_Cfhezngd7Xne_uRJ4D5_IVInz7d_e5LXJGOm6_MF_cPbS2e3TGWpKT7.upuBqFxxaGfqgbU2T 1Cz8TLQ6Dp2BFeIQY9rykQCfS5dT1v109Wyn.rkQZYEcDwI_sBdUH6t7lOpaMAz58QVU6hdFlvCD Y0bszTz4peRrzWv7a82f0dTG5pomPtzmUXLuLPh_Un_Mld2mVRL3WhTvGW3dZV3g.zlAMsEU1_Cu bsugkButrM_mSKJ5iPkT7RwGgFxmMHQVTNInQnAaBm3WMdzzqLhW6lCfgaFfEVFuO.tVDEBX18et W6Xv46DWwCcwG0MtKtYDPp4SWmfDFbJgCzCr_D_uyzOebvHhZocOUc8YJwk86cCOuFbJYB2328yB JXpqg9qfuIIKYF_4YkEvXCSIRBA.WuiE3gDo2QZhZUj9Gb9Nbklwy92d42Mahj9NX3DS_qg1iBPD VqIH0MNNFLxBbHWhGWLzitDvJxi0hBVKg8c2zllEm_r4Nh5GN3FVHiNL3uKG5WYqCNhmnD3Q4Fdy .FFhbpWDEI86OrX3Oi1HMjQPDi2TDUl0.NNM.h0rZt8ZSAqky.ri5LAuLpL5K_qDYrQZgKOkdCn3 YrDJlOsTFI55hXTBmN8rjj1h1u8fvQVA3PiS38YoHNj6UCYJEYlRGx_1wcz1RwTk2j0lnpUMYelj 1dpHaIkjTF4bsnbdLN.MCgP5q5qND5RmUu6daCz5uxqJr0ebEnaVcUNpWyCd8eUM3ah5vPw-- Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.ne1.yahoo.com with HTTP; Thu, 25 Apr 2019 19:23:37 +0000 Received: from 18.175.75.177.infopasa.com.br (EHLO gateway.troianet.com.br) ([177.75.175.18]) by smtp407.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 72202aba1011b51f9b99c7344684a0e6; Thu, 25 Apr 2019 19:23:35 +0000 (UTC) From: Eneas U de Queiroz <cote2004-github@yahoo.com> To: openwrt-devel@lists.openwrt.org Cc: Eneas U de Queiroz <cote2004-github@yahoo.com> Subject: [PATCH] openssl: build kmods only if engines are selected Date: Thu, 25 Apr 2019 16:23:27 -0300 Message-Id: <20190425192327.7073-1-cote2004-github@yahoo.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190425_122338_395527_C433EF78 X-CRM114-Status: UNSURE ( 5.83 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [66.163.190.147 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (cote2004-github[at]yahoo.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Add a conditional to the individual package's for the kmods in DEPENDS. This avoids the need to compile the kernel modules when the crypto engine packages are not selected. The final binares are not affected by this. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> --- This trick takes, for example, $(curdir)/kernel/cryptodev-linux/compile from the $(curdir)/kernel/cryptodev-linux/compile+= line in tmp/.packagedeps, and changes it to: $(if $(CONFIG_PACKAGE_libopenssl-devcrypto),$(curdir)/kernel/cryptodev-linux/compile) so it will only build kmod-cryptodev (from the cryptodev-linux package) if the devcrypto engine is actually selected. The conditionals in tmp/.config-package.in are optimized out, so it does not change that file, and it will not result in recursive dependencies. diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index 6f0b0aac5b..b16bf9854f 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -139,8 +139,8 @@ define Package/libopenssl-afalg $(call Package/openssl/Default) SUBMENU:=SSL TITLE:=AFALG hardware acceleration engine - DEPENDS:=libopenssl @OPENSSL_ENGINE @KERNEL_AIO @!LINUX_3_18 +kmod-crypto-user \ - +libopenssl-conf @!OPENSSL_ENGINE_BUILTIN + DEPENDS:=libopenssl @OPENSSL_ENGINE @KERNEL_AIO @!LINUX_3_18 \ + +PACKAGE_libopenssl-afalg:kmod-crypto-user +libopenssl-conf @!OPENSSL_ENGINE_BUILTIN endef define Package/libopenssl-afalg/description @@ -156,7 +156,7 @@ define Package/libopenssl-devcrypto $(call Package/openssl/Default) SUBMENU:=SSL TITLE:=/dev/crypto hardware acceleration engine - DEPENDS:=libopenssl @OPENSSL_ENGINE +kmod-cryptodev +libopenssl-conf \ + DEPENDS:=libopenssl @OPENSSL_ENGINE +PACKAGE_libopenssl-devcrypto:kmod-cryptodev +libopenssl-conf \ @!OPENSSL_ENGINE_BUILTIN endef @@ -173,7 +173,7 @@ define Package/libopenssl-padlock $(call Package/openssl/Default) SUBMENU:=SSL TITLE:=VIA Padlock hardware acceleration engine - DEPENDS:=libopenssl @OPENSSL_ENGINE @TARGET_x86 +kmod-crypto-hw-padlock \ + DEPENDS:=libopenssl @OPENSSL_ENGINE @TARGET_x86 +PACKAGE_libopenssl-padlock:kmod-crypto-hw-padlock \ +libopenssl-conf @!OPENSSL_ENGINE_BUILTIN endef ]