From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 23 Sep 2024 12:25:29 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1ssgFz-001lVK-3B for lore@lore.pengutronix.de; Mon, 23 Sep 2024 12:25:29 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ssgG0-0002U2-MR; Mon, 23 Sep 2024 12:25:28 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ssgFj-0002Tn-ED; Mon, 23 Sep 2024 12:25:11 +0200 Received: from [2a0a:edc0:0:1101:1d::ac] (helo=dude04.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1ssgFj-000w0q-22; Mon, 23 Sep 2024 12:25:11 +0200 Received: from rhi by dude04.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1ssgFj-004cK7-01; Mon, 23 Sep 2024 12:25:11 +0200 From: Roland Hieber To: ptxdist@pengutronix.de Date: Mon, 23 Sep 2024 12:25:06 +0200 Message-Id: <20240923102506.1100544-1-rhi@pengutronix.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Mail-Followup-To: Roland Hieber , ptxdist@pengutronix.de Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH v2] open62541: fix inclusion of mdnsd license in license report X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Signed-off-by: Roland Hieber --- 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