[openwrt/openwrt] openssl: move engine.mk to INCLUDE_DIR

LEDE Commits lede-commits at lists.infradead.org
Wed Mar 23 16:14:08 PDT 2022


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/1bf94b6797a1e04c0d3accd08b3efb666fbb280e

commit 1bf94b6797a1e04c0d3accd08b3efb666fbb280e
Author: Eneas U de Queiroz <cotequeiroz at gmail.com>
AuthorDate: Tue Mar 22 14:03:30 2022 -0300

    openssl: move engine.mk to INCLUDE_DIR
    
    engine.mk is supposed to be included by engine packages, but it will not
    be present in the SDK in the same place as in the main repository.
    
    Move it to include/openssl-engine.mk to avoid this.
    
    Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
---
 package/libs/openssl/engine.mk => include/openssl-engine.mk | 4 ++++
 package/libs/openssl/Makefile                               | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package/libs/openssl/engine.mk b/include/openssl-engine.mk
similarity index 93%
rename from package/libs/openssl/engine.mk
rename to include/openssl-engine.mk
index 973a989904..d8baba482e 100644
--- a/package/libs/openssl/engine.mk
+++ b/include/openssl-engine.mk
@@ -1,3 +1,7 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Copyright (C) 2022 Enéas Ulir de Queiroz
+
 ENGINES_DIR=engines-1.1
 
 define Package/openssl/engine/Default
diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile
index b50620118a..b771edfc84 100644
--- a/package/libs/openssl/Makefile
+++ b/package/libs/openssl/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=openssl
 PKG_BASE:=1.1.1
 PKG_BUGFIX:=n
 PKG_VERSION:=$(PKG_BASE)$(PKG_BUGFIX)
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 PKG_USE_MIPS16:=0
 
 PKG_BUILD_PARALLEL:=1
@@ -64,7 +64,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_OPENSSL_WITH_WHIRLPOOL
 
 include $(INCLUDE_DIR)/package.mk
-include engine.mk
+include $(INCLUDE_DIR)/openssl-engine.mk
 
 ifneq ($(CONFIG_CCACHE),)
 HOSTCC=$(HOSTCC_NOCACHE)




More information about the lede-commits mailing list