[ptxdist] [PATCH] zstd: update license info

[ptxdist] [PATCH] zstd: update license info

[Bruno Thomsen]

Add hash of license files and include "OR GPL-2.0-only".

README.md states that zstd is dual licensed:

This repository represents the reference implementation, provided as an
open-source dual BSD OR GPLv2 licensed C library, and a command line
utility producing and decoding .zst, .gz, .xz and .lz4 files.

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

diff --git a/rules/zstd.make b/rules/zstd.make
index 88747d984df3..6310cc4fc9ef 100644
--- a/rules/zstd.make
+++ b/rules/zstd.make
@@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd
 #
 # Paths and names
 #
-ZSTD_VERSION	:= 1.5.5
-ZSTD_MD5	:= 4ff0ee1965ab161bc55be7c9dcd1f7f9
-ZSTD		:= zstd-$(ZSTD_VERSION)
-ZSTD_SUFFIX	:= tar.gz
-ZSTD_URL	:= https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX)
-ZSTD_SOURCE	:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX)
-ZSTD_DIR	:= $(BUILDDIR)/$(ZSTD)
-ZSTD_SUBDIR	:= build/cmake
-ZSTD_LICENSE	:= BSD-3-clause
+ZSTD_VERSION		:= 1.5.5
+ZSTD_MD5		:= 4ff0ee1965ab161bc55be7c9dcd1f7f9
+ZSTD			:= zstd-$(ZSTD_VERSION)
+ZSTD_SUFFIX		:= tar.gz
+ZSTD_URL		:= https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX)
+ZSTD_SOURCE		:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX)
+ZSTD_DIR		:= $(BUILDDIR)/$(ZSTD)
+ZSTD_SUBDIR		:= build/cmake
+ZSTD_LICENSE		:= BSD-3-clause OR GPL-2.0-only
+ZSTD_LICENSE_FILES	:= \
+	file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
+	file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0
 
 # ----------------------------------------------------------------------------
 # Prepare

base-commit: cae7daaa8850c4d952427fac5bcf4d8ffc553226
-- 
2.41.0

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

[Michael Olbrich]

Thanks, applied as 3fbab6d4ea9ac889544074a83f027e4415ef1ec2.

Michael

[sent from post-receive hook]

On Fri, 17 Nov 2023 08:20:35 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Add hash of license files and include "OR GPL-2.0-only".
> 
> README.md states that zstd is dual licensed:
> 
> This repository represents the reference implementation, provided as an
> open-source dual BSD OR GPLv2 licensed C library, and a command line
> utility producing and decoding .zst, .gz, .xz and .lz4 files.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231108215228.64980-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/zstd.make b/rules/zstd.make
> index 88747d984df3..6310cc4fc9ef 100644
> --- a/rules/zstd.make
> +++ b/rules/zstd.make
> @@ -14,15 +14,18 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd
>  #
>  # Paths and names
>  #
> -ZSTD_VERSION	:= 1.5.5
> -ZSTD_MD5	:= 4ff0ee1965ab161bc55be7c9dcd1f7f9
> -ZSTD		:= zstd-$(ZSTD_VERSION)
> -ZSTD_SUFFIX	:= tar.gz
> -ZSTD_URL	:= https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX)
> -ZSTD_SOURCE	:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX)
> -ZSTD_DIR	:= $(BUILDDIR)/$(ZSTD)
> -ZSTD_SUBDIR	:= build/cmake
> -ZSTD_LICENSE	:= BSD-3-clause
> +ZSTD_VERSION		:= 1.5.5
> +ZSTD_MD5		:= 4ff0ee1965ab161bc55be7c9dcd1f7f9
> +ZSTD			:= zstd-$(ZSTD_VERSION)
> +ZSTD_SUFFIX		:= tar.gz
> +ZSTD_URL		:= https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX)
> +ZSTD_SOURCE		:= $(SRCDIR)/$(ZSTD).$(ZSTD_SUFFIX)
> +ZSTD_DIR		:= $(BUILDDIR)/$(ZSTD)
> +ZSTD_SUBDIR		:= build/cmake
> +ZSTD_LICENSE		:= BSD-3-clause OR GPL-2.0-only
> +ZSTD_LICENSE_FILES	:= \
> +	file://LICENSE;md5=0822a32f7acdbe013606746641746ee8 \
> +	file://COPYING;md5=39bba7d2cf0ba1036f2a6e2be52fe3f0
>  
>  # ----------------------------------------------------------------------------
>  # Prepare