Signed-off-by: Roland Hieber <[email protected]>
---
PATCH v2:
 * fix host package which doesn't have mdnsd
---
 rules/host-open62541.make |  4 ++++
 rules/open62541.make      | 11 +++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/rules/host-open62541.make b/rules/host-open62541.make
index f554ce2e0015..0f09c8ddbb09 100644
--- a/rules/host-open62541.make
+++ b/rules/host-open62541.make
@@ -12,6 +12,10 @@
 #
 HOST_PACKAGES-$(PTXCONF_HOST_OPEN62541) += host-open62541
 
+# host-open62541 doesn't need the mdnsd dependency like open62541, so its 
license differs
+HOST_OPEN62541_LICENSE         = MPL-2.0
+HOST_OPEN62541_LICENSE_FILES   = 
file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
diff --git a/rules/open62541.make b/rules/open62541.make
index 59bdc9f49006..39d641231c09 100644
--- a/rules/open62541.make
+++ b/rules/open62541.make
@@ -22,8 +22,6 @@ OPEN62541_SUFFIX              := tar.gz
 OPEN62541_URL                  := 
https://github.com/open62541/open62541/archive/refs/tags/v$(OPEN62541_VERSION).$(OPEN62541_SUFFIX)
 OPEN62541_SOURCE               := $(SRCDIR)/$(OPEN62541).$(OPEN62541_SUFFIX)
 OPEN62541_DIR                  := $(BUILDDIR)/$(OPEN62541)
-OPEN62541_LICENSE              := MPL-2.0
-OPEN62541_LICENSE_FILES                := 
file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad
 
 # use tarballs instead of git submodules
 # see https://github.com/open62541/open62541/tree/v$(version)/deps
@@ -34,13 +32,18 @@ OPEN62541_MDNSD_SUFFIX              := tar.gz
 OPEN62541_MDNSD_URL            := 
https://github.com/Pro/mdnsd/archive/$(OPEN62541_MDNSD_VERSION).$(OPEN62541_MDNSD_SUFFIX)
 OPEN62541_MDNSD_SOURCE         := 
$(SRCDIR)/$(OPEN62541_MDNSD).$(OPEN62541_MDNSD_SUFFIX)
 OPEN62541_MDNSD_DIR            := $(OPEN62541_DIR)/deps/mdnsd
-OPEN62541_MDNSD_LICENSE                := BSD-3-Clause
-OPEN62541_MDNSD_LICENSE_FILES  := 
file://LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0
+OPEN62541_MDNS_LICENSE         := AND BSD-3-Clause
+OPEN62541_MDNS_LICENSE_FILES   := 
file://deps/mdnsd/LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0
 
 OPEN62541_DEVPKG               := NO
 
 OPEN62541_PARTS                        += OPEN62541_MDNSD
 
+OPEN62541_LICENSE              := $(HOST_OPEN62541_LICENSE) AND 
$(OPEN62541_MDNS_LICENSE)
+OPEN62541_LICENSE_FILES                := \
+       $(HOST_OPEN62541_LICENSE_FILES) \
+       $(OPEN62541_MDNS_LICENSE_FILES)
+
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
-- 
2.39.5


Reply via email to