Re: [ptxdist] [APPLIED] open62541: fix inclusion of mdnsd license in license report

[Michael Olbrich <m.olbrich@pengutronix.de>]

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
>  # ----------------------------------------------------------------------------