* [ptxdist] [PATCH] open62541: fix inclusion of mdnsd license in license report
@ 2024-08-26 12:49 Roland Hieber
2024-09-13 7:06 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2024-08-26 12:49 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/open62541.make | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rules/open62541.make b/rules/open62541.make
index 1da04c7f9e69..a44bc189a816 100644
--- a/rules/open62541.make
+++ b/rules/open62541.make
@@ -34,8 +34,8 @@ 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_LICENSE += AND BSD-3-Clause
+OPEN62541_LICENSE_FILES += file://deps/mdnsd/LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0
OPEN62541_DEVPKG := NO
--
2.39.2
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] open62541: fix inclusion of mdnsd license in license report
2024-08-26 12:49 [ptxdist] [PATCH] open62541: fix inclusion of mdnsd license in license report Roland Hieber
@ 2024-09-13 7:06 ` Michael Olbrich
2024-09-18 10:48 ` Roland Hieber
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2024-09-13 7:06 UTC (permalink / raw)
To: Roland Hieber, ptxdist
On Mon, Aug 26, 2024 at 02:49:29PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
> rules/open62541.make | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/rules/open62541.make b/rules/open62541.make
> index 1da04c7f9e69..a44bc189a816 100644
> --- a/rules/open62541.make
> +++ b/rules/open62541.make
> @@ -34,8 +34,8 @@ 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_LICENSE += AND BSD-3-Clause
> +OPEN62541_LICENSE_FILES += file://deps/mdnsd/LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0
License check fails because this file does not exist.
Michael
>
> OPEN62541_DEVPKG := NO
>
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] open62541: fix inclusion of mdnsd license in license report
2024-09-13 7:06 ` Michael Olbrich
@ 2024-09-18 10:48 ` Roland Hieber
2024-09-18 14:52 ` Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2024-09-18 10:48 UTC (permalink / raw)
To: ptxdist
On Fri, Sep 13, 2024 at 09:06:00AM +0200, Michael Olbrich wrote:
> On Mon, Aug 26, 2024 at 02:49:29PM +0200, Roland Hieber wrote:
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> > rules/open62541.make | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/rules/open62541.make b/rules/open62541.make
> > index 1da04c7f9e69..a44bc189a816 100644
> > --- a/rules/open62541.make
> > +++ b/rules/open62541.make
> > @@ -34,8 +34,8 @@ 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_LICENSE += AND BSD-3-Clause
> > +OPEN62541_LICENSE_FILES += file://deps/mdnsd/LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0
>
> License check fails because this file does not exist.
It only fails for me in host-open62541.report. I assume that
OPEN62541_PARTS += OPEN62541_MDNSD is not applied to the host package,
because platform-v7a/build-host/open62541-1.3.4/deps/mdnsd/ is empty.
- Roland
--
Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de |
Steuerwalder Str. 21 | https://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] open62541: fix inclusion of mdnsd license in license report
2024-09-18 10:48 ` Roland Hieber
@ 2024-09-18 14:52 ` Michael Olbrich
2024-09-23 10:25 ` [ptxdist] [PATCH v2] " Roland Hieber
0 siblings, 1 reply; 6+ messages in thread
From: Michael Olbrich @ 2024-09-18 14:52 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
On Wed, Sep 18, 2024 at 12:48:46PM +0200, Roland Hieber wrote:
> On Fri, Sep 13, 2024 at 09:06:00AM +0200, Michael Olbrich wrote:
> > On Mon, Aug 26, 2024 at 02:49:29PM +0200, Roland Hieber wrote:
> > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > ---
> > > rules/open62541.make | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/rules/open62541.make b/rules/open62541.make
> > > index 1da04c7f9e69..a44bc189a816 100644
> > > --- a/rules/open62541.make
> > > +++ b/rules/open62541.make
> > > @@ -34,8 +34,8 @@ 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_LICENSE += AND BSD-3-Clause
> > > +OPEN62541_LICENSE_FILES += file://deps/mdnsd/LICENSE;md5=3bb4047dc4095cd7336de3e2a9be94f0
> >
> > License check fails because this file does not exist.
>
> It only fails for me in host-open62541.report. I assume that
> OPEN62541_PARTS += OPEN62541_MDNSD is not applied to the host package,
> because platform-v7a/build-host/open62541-1.3.4/deps/mdnsd/ is empty.
Right, I just saw the error in the build log and didn't look close enough.
Hmm, so the mdnsd stuff is not needed to build the host package. I think
you need to specify the license for host-open62541 explicitly. And please
add a comment, why this is necessary.
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH v2] open62541: fix inclusion of mdnsd license in license report
2024-09-18 14:52 ` Michael Olbrich
@ 2024-09-23 10:25 ` Roland Hieber
2024-09-26 13:18 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 6+ messages in thread
From: Roland Hieber @ 2024-09-23 10:25 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [APPLIED] open62541: fix inclusion of mdnsd license in license report
2024-09-23 10:25 ` [ptxdist] [PATCH v2] " Roland Hieber
@ 2024-09-26 13:18 ` Michael Olbrich
0 siblings, 0 replies; 6+ messages in thread
From: Michael Olbrich @ 2024-09-26 13:18 UTC (permalink / raw)
To: ptxdist; +Cc: Roland Hieber
Thanks, applied as 4948d954f0c7be328fbdbd98e89a0326d56aa2cf.
Michael
[sent from post-receive hook]
On Thu, 26 Sep 2024 15:18:59 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20240923102506.1100544-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> 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
> # ----------------------------------------------------------------------------
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-26 13:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-08-26 12:49 [ptxdist] [PATCH] open62541: fix inclusion of mdnsd license in license report 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 ` [ptxdist] [PATCH v2] " Roland Hieber
2024-09-26 13:18 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox