From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH v2] open62541: fix inclusion of mdnsd license in license report
Date: Mon, 23 Sep 2024 12:25:06 +0200 [thread overview]
Message-ID: <20240923102506.1100544-1-rhi@pengutronix.de> (raw)
In-Reply-To: <ZurpMkfoZeQdzG-8@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
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
next prev parent reply other threads:[~2024-09-23 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-26 12:49 [ptxdist] [PATCH] " Roland Hieber
2024-09-13 7:06 ` Michael Olbrich
2024-09-18 10:48 ` Roland Hieber
2024-09-18 14:52 ` Michael Olbrich
2024-09-23 10:25 ` Roland Hieber [this message]
2024-09-26 13:18 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240923102506.1100544-1-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox