[ptxdist] [PATCH] dbus: update license info

[ptxdist] [PATCH] dbus: update license info

[Bruno Thomsen]

Update license based on information in the COPYING file.
Add hashes of license files.

Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
 rules/dbus.make | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/rules/dbus.make b/rules/dbus.make
index a1b68a5a3afb..fca1f57faa2f 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -16,14 +16,19 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
 #
 # Paths and names
 #
-DBUS_VERSION	:= 1.15.8
-DBUS_MD5	:= 66a38f65320762e0734340fb6facdcce
-DBUS		:= dbus-$(DBUS_VERSION)
-DBUS_SUFFIX	:= tar.xz
-DBUS_URL	:= https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
-DBUS_SOURCE	:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX)
-DBUS_DIR	:= $(BUILDDIR)/$(DBUS)
-DBUS_LICENSE	:= AFL-2.1 AND GPL-2.0-or-later
+DBUS_VERSION		:= 1.15.8
+DBUS_MD5		:= 66a38f65320762e0734340fb6facdcce
+DBUS			:= dbus-$(DBUS_VERSION)
+DBUS_SUFFIX		:= tar.xz
+DBUS_URL		:= https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
+DBUS_SOURCE		:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX)
+DBUS_DIR		:= $(BUILDDIR)/$(DBUS)
+DBUS_LICENSE		:= (AFL-2.1 OR GPL-2.0-or-later) AND MIT
+DBUS_LICENSE_FILES	:= \
+	file://COPYING;md5=eb0ffc69a965797a3d6686baa153ef05 \
+	file://LICENSES/AFL-2.1.txt;md5=f3ad2f482ec639b440413665cfb9e714 \
+	file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \
+	file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663
 
 # ----------------------------------------------------------------------------
 # Prepare

base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226
-- 
2.41.0

Re: [ptxdist] [APPLIED] dbus: update license info

[Michael Olbrich]

Thanks, applied as ffaea5397a4ab6eca5c5e4e05d566721a6e09f26.

Michael

[sent from post-receive hook]

On Fri, 17 Nov 2023 08:20:36 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Update license based on information in the COPYING file.
> Add hashes of license files.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231109101446.9447-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/dbus.make b/rules/dbus.make
> index a1b68a5a3afb..fca1f57faa2f 100644
> --- a/rules/dbus.make
> +++ b/rules/dbus.make
> @@ -16,14 +16,19 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
>  #
>  # Paths and names
>  #
> -DBUS_VERSION	:= 1.15.8
> -DBUS_MD5	:= 66a38f65320762e0734340fb6facdcce
> -DBUS		:= dbus-$(DBUS_VERSION)
> -DBUS_SUFFIX	:= tar.xz
> -DBUS_URL	:= https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
> -DBUS_SOURCE	:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX)
> -DBUS_DIR	:= $(BUILDDIR)/$(DBUS)
> -DBUS_LICENSE	:= AFL-2.1 AND GPL-2.0-or-later
> +DBUS_VERSION		:= 1.15.8
> +DBUS_MD5		:= 66a38f65320762e0734340fb6facdcce
> +DBUS			:= dbus-$(DBUS_VERSION)
> +DBUS_SUFFIX		:= tar.xz
> +DBUS_URL		:= https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
> +DBUS_SOURCE		:= $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX)
> +DBUS_DIR		:= $(BUILDDIR)/$(DBUS)
> +DBUS_LICENSE		:= (AFL-2.1 OR GPL-2.0-or-later) AND MIT
> +DBUS_LICENSE_FILES	:= \
> +	file://COPYING;md5=eb0ffc69a965797a3d6686baa153ef05 \
> +	file://LICENSES/AFL-2.1.txt;md5=f3ad2f482ec639b440413665cfb9e714 \
> +	file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \
> +	file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663
>  
>  # ----------------------------------------------------------------------------
>  # Prepare