From 2d5cf9fc18f4d8f3942b08d0898577c848d39d99 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Fri, 25 Mar 2022 15:03:58 +0800 Subject: [PATCH] openssl: move engine.mk to INCLUDE_DIR (#9127) 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 Co-authored-by: Eneas U de Queiroz --- package/libs/openssl/engine.mk => include/openssl-engine.mk | 4 ++++ package/libs/openssl/Makefile | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) rename package/libs/openssl/engine.mk => include/openssl-engine.mk (93%) 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 973a98990..d8baba482 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 4f1dd5931..a8ec5d015 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 @@ -66,7 +66,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)