* [ptxdist] [PATCH 2/6] grep: add license information
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
@ 2023-11-14 11:48 ` Bruno Thomsen
2023-11-24 7:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-11-14 11:48 ` [ptxdist] [PATCH 3/6] htop: add license file and hash Bruno Thomsen
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Bruno Thomsen @ 2023-11-14 11:48 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
Add license information based on COPYING and web page, including
license file and hash.
Licensing from web page[1]:
Grep is free software; you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
Foundation; either version 3 of the License, or (at your option) any later
version.
[1] https://www.gnu.org/software/grep/
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/grep.make | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/rules/grep.make b/rules/grep.make
index 7c6280a33368..a1dc4eb716a2 100644
--- a/rules/grep.make
+++ b/rules/grep.make
@@ -15,13 +15,16 @@ PACKAGES-$(PTXCONF_GREP) += grep
#
# Paths and names
#
-GREP_VERSION := 3.8
-GREP_MD5 := dc6e4d18d4659e6e7552fc4a183c8ac9
-GREP := grep-$(GREP_VERSION)
-GREP_SUFFIX := tar.xz
-GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX))
-GREP_SOURCE := $(SRCDIR)/$(GREP).$(GREP_SUFFIX)
-GREP_DIR := $(BUILDDIR)/$(GREP)
+GREP_VERSION := 3.8
+GREP_MD5 := dc6e4d18d4659e6e7552fc4a183c8ac9
+GREP := grep-$(GREP_VERSION)
+GREP_SUFFIX := tar.xz
+GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX))
+GREP_SOURCE := $(SRCDIR)/$(GREP).$(GREP_SUFFIX)
+GREP_DIR := $(BUILDDIR)/$(GREP)
+GREP_LICENSE := GPL-3.0-or-later
+GREP_LICENSE_FILES := \
+ file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464
# ----------------------------------------------------------------------------
# Prepare
--
2.41.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [ptxdist] [APPLIED] grep: add license information
2023-11-14 11:48 ` [ptxdist] [PATCH 2/6] grep: add license information Bruno Thomsen
@ 2023-11-24 7:28 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-11-24 7:28 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as fbe39b9b7d1a2fb941178577019134584c1d9f95.
Michael
[sent from post-receive hook]
On Fri, 24 Nov 2023 08:28:14 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Add license information based on COPYING and web page, including
> license file and hash.
>
> Licensing from web page[1]:
>
> Grep is free software; you can redistribute it and/or modify it under the
> terms of the GNU General Public License as published by the Free Software
> Foundation; either version 3 of the License, or (at your option) any later
> version.
>
> [1] https://www.gnu.org/software/grep/
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231114114807.23620-2-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/grep.make b/rules/grep.make
> index 7c6280a33368..a1dc4eb716a2 100644
> --- a/rules/grep.make
> +++ b/rules/grep.make
> @@ -15,13 +15,16 @@ PACKAGES-$(PTXCONF_GREP) += grep
> #
> # Paths and names
> #
> -GREP_VERSION := 3.8
> -GREP_MD5 := dc6e4d18d4659e6e7552fc4a183c8ac9
> -GREP := grep-$(GREP_VERSION)
> -GREP_SUFFIX := tar.xz
> -GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX))
> -GREP_SOURCE := $(SRCDIR)/$(GREP).$(GREP_SUFFIX)
> -GREP_DIR := $(BUILDDIR)/$(GREP)
> +GREP_VERSION := 3.8
> +GREP_MD5 := dc6e4d18d4659e6e7552fc4a183c8ac9
> +GREP := grep-$(GREP_VERSION)
> +GREP_SUFFIX := tar.xz
> +GREP_URL := $(call ptx/mirror, GNU, grep/$(GREP).$(GREP_SUFFIX))
> +GREP_SOURCE := $(SRCDIR)/$(GREP).$(GREP_SUFFIX)
> +GREP_DIR := $(BUILDDIR)/$(GREP)
> +GREP_LICENSE := GPL-3.0-or-later
> +GREP_LICENSE_FILES := \
> + file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 3/6] htop: add license file and hash
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
2023-11-14 11:48 ` [ptxdist] [PATCH 2/6] grep: add license information Bruno Thomsen
@ 2023-11-14 11:48 ` Bruno Thomsen
2023-11-24 7:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-11-14 11:48 ` [ptxdist] [PATCH 4/6] iptables: " Bruno Thomsen
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Bruno Thomsen @ 2023-11-14 11:48 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/htop.make | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/rules/htop.make b/rules/htop.make
index 06c64718fa9a..98d6bbfdf39c 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_HTOP) += htop
#
# Paths and names
#
-HTOP_VERSION := 3.0.1
-HTOP_MD5 := c09908bacb5e22454715547aed88c3af
-HTOP := htop-$(HTOP_VERSION)
-HTOP_SUFFIX := tar.gz
-HTOP_URL := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
-HTOP_SOURCE := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
-HTOP_DIR := $(BUILDDIR)/$(HTOP)
-HTOP_LICENSE := GPL-2.0-only
+HTOP_VERSION := 3.0.1
+HTOP_MD5 := c09908bacb5e22454715547aed88c3af
+HTOP := htop-$(HTOP_VERSION)
+HTOP_SUFFIX := tar.gz
+HTOP_URL := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
+HTOP_SOURCE := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
+HTOP_DIR := $(BUILDDIR)/$(HTOP)
+HTOP_LICENSE := GPL-2.0-only
+HTOP_LICENSE_FILES := \
+ file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891
# ----------------------------------------------------------------------------
# Prepare
--
2.41.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [ptxdist] [APPLIED] htop: add license file and hash
2023-11-14 11:48 ` [ptxdist] [PATCH 3/6] htop: add license file and hash Bruno Thomsen
@ 2023-11-24 7:28 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-11-24 7:28 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 14d77c1d8f1c46de06fcf8b79c92aac9c4d294da.
Michael
[sent from post-receive hook]
On Fri, 24 Nov 2023 08:28:15 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231114114807.23620-3-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/htop.make b/rules/htop.make
> index 06c64718fa9a..98d6bbfdf39c 100644
> --- a/rules/htop.make
> +++ b/rules/htop.make
> @@ -15,14 +15,16 @@ PACKAGES-$(PTXCONF_HTOP) += htop
> #
> # Paths and names
> #
> -HTOP_VERSION := 3.0.1
> -HTOP_MD5 := c09908bacb5e22454715547aed88c3af
> -HTOP := htop-$(HTOP_VERSION)
> -HTOP_SUFFIX := tar.gz
> -HTOP_URL := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
> -HTOP_SOURCE := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
> -HTOP_DIR := $(BUILDDIR)/$(HTOP)
> -HTOP_LICENSE := GPL-2.0-only
> +HTOP_VERSION := 3.0.1
> +HTOP_MD5 := c09908bacb5e22454715547aed88c3af
> +HTOP := htop-$(HTOP_VERSION)
> +HTOP_SUFFIX := tar.gz
> +HTOP_URL := https://github.com/htop-dev/htop/archive/$(HTOP_VERSION).$(HTOP_SUFFIX)
> +HTOP_SOURCE := $(SRCDIR)/$(HTOP).$(HTOP_SUFFIX)
> +HTOP_DIR := $(BUILDDIR)/$(HTOP)
> +HTOP_LICENSE := GPL-2.0-only
> +HTOP_LICENSE_FILES := \
> + file://COPYING;md5=4099d367cd5e59b6d4fc1ee33accb891
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 4/6] iptables: add license file and hash
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
2023-11-14 11:48 ` [ptxdist] [PATCH 2/6] grep: add license information Bruno Thomsen
2023-11-14 11:48 ` [ptxdist] [PATCH 3/6] htop: add license file and hash Bruno Thomsen
@ 2023-11-14 11:48 ` Bruno Thomsen
2023-11-24 7:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-11-14 11:48 ` [ptxdist] [PATCH 5/6] libfastjson: " Bruno Thomsen
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Bruno Thomsen @ 2023-11-14 11:48 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/iptables.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules/iptables.make b/rules/iptables.make
index 1444d6d10f2c..580edc3046ce 100644
--- a/rules/iptables.make
+++ b/rules/iptables.make
@@ -27,6 +27,8 @@ IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SU
IPTABLES_SOURCE := $(SRCDIR)/$(IPTABLES).$(IPTABLES_SUFFIX)
IPTABLES_DIR := $(BUILDDIR)/$(IPTABLES)
IPTABLES_LICENSE := GPL-2.0-only
+IPTABLES_LICENSE_FILES := \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
# ----------------------------------------------------------------------------
# Prepare
--
2.41.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [ptxdist] [APPLIED] iptables: add license file and hash
2023-11-14 11:48 ` [ptxdist] [PATCH 4/6] iptables: " Bruno Thomsen
@ 2023-11-24 7:28 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-11-24 7:28 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as d58a9d52cd2650ed6e73287c7335c6610dbc51db.
Michael
[sent from post-receive hook]
On Fri, 24 Nov 2023 08:28:17 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231114114807.23620-4-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/iptables.make b/rules/iptables.make
> index 1444d6d10f2c..580edc3046ce 100644
> --- a/rules/iptables.make
> +++ b/rules/iptables.make
> @@ -27,6 +27,8 @@ IPTABLES_URL := http://ftp.netfilter.org/pub/iptables/$(IPTABLES).$(IPTABLES_SU
> IPTABLES_SOURCE := $(SRCDIR)/$(IPTABLES).$(IPTABLES_SUFFIX)
> IPTABLES_DIR := $(BUILDDIR)/$(IPTABLES)
> IPTABLES_LICENSE := GPL-2.0-only
> +IPTABLES_LICENSE_FILES := \
> + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 5/6] libfastjson: add license file and hash
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
` (2 preceding siblings ...)
2023-11-14 11:48 ` [ptxdist] [PATCH 4/6] iptables: " Bruno Thomsen
@ 2023-11-14 11:48 ` Bruno Thomsen
2023-11-24 7:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-11-14 11:48 ` [ptxdist] [PATCH 6/6] json-glib: " Bruno Thomsen
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Bruno Thomsen @ 2023-11-14 11:48 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/libfastjson.make | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/rules/libfastjson.make b/rules/libfastjson.make
index 0d1ec5a1c7be..34a918c16217 100644
--- a/rules/libfastjson.make
+++ b/rules/libfastjson.make
@@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBFASTJSON) += libfastjson
#
# Paths and names
#
-LIBFASTJSON_VERSION := 0.99.8
-LIBFASTJSON_MD5 := 730713ad1d851def7ac8898f751bbfdd
-LIBFASTJSON := libfastjson-$(LIBFASTJSON_VERSION)
-LIBFASTJSON_SUFFIX := tar.gz
-LIBFASTJSON_URL := https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION)
-LIBFASTJSON_SOURCE := $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX)
-LIBFASTJSON_DIR := $(BUILDDIR)/$(LIBFASTJSON)
-LIBFASTJSON_LICENSE := MIT
+LIBFASTJSON_VERSION := 0.99.8
+LIBFASTJSON_MD5 := 730713ad1d851def7ac8898f751bbfdd
+LIBFASTJSON := libfastjson-$(LIBFASTJSON_VERSION)
+LIBFASTJSON_SUFFIX := tar.gz
+LIBFASTJSON_URL := https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION)
+LIBFASTJSON_SOURCE := $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX)
+LIBFASTJSON_DIR := $(BUILDDIR)/$(LIBFASTJSON)
+LIBFASTJSON_LICENSE := MIT
+LIBFASTJSON_LICENSE_FILES := \
+ file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f
# ----------------------------------------------------------------------------
# Prepare
--
2.41.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [ptxdist] [APPLIED] libfastjson: add license file and hash
2023-11-14 11:48 ` [ptxdist] [PATCH 5/6] libfastjson: " Bruno Thomsen
@ 2023-11-24 7:28 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-11-24 7:28 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 86ad77f2c030a2973c0c07e9fda236b46a32d6de.
Michael
[sent from post-receive hook]
On Fri, 24 Nov 2023 08:28:18 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231114114807.23620-5-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/libfastjson.make b/rules/libfastjson.make
> index 0d1ec5a1c7be..34a918c16217 100644
> --- a/rules/libfastjson.make
> +++ b/rules/libfastjson.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_LIBFASTJSON) += libfastjson
> #
> # Paths and names
> #
> -LIBFASTJSON_VERSION := 0.99.8
> -LIBFASTJSON_MD5 := 730713ad1d851def7ac8898f751bbfdd
> -LIBFASTJSON := libfastjson-$(LIBFASTJSON_VERSION)
> -LIBFASTJSON_SUFFIX := tar.gz
> -LIBFASTJSON_URL := https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION)
> -LIBFASTJSON_SOURCE := $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX)
> -LIBFASTJSON_DIR := $(BUILDDIR)/$(LIBFASTJSON)
> -LIBFASTJSON_LICENSE := MIT
> +LIBFASTJSON_VERSION := 0.99.8
> +LIBFASTJSON_MD5 := 730713ad1d851def7ac8898f751bbfdd
> +LIBFASTJSON := libfastjson-$(LIBFASTJSON_VERSION)
> +LIBFASTJSON_SUFFIX := tar.gz
> +LIBFASTJSON_URL := https://codeload.github.com/rsyslog/libfastjson/$(LIBFASTJSON_SUFFIX)/v$(LIBFASTJSON_VERSION)
> +LIBFASTJSON_SOURCE := $(SRCDIR)/$(LIBFASTJSON).$(LIBFASTJSON_SUFFIX)
> +LIBFASTJSON_DIR := $(BUILDDIR)/$(LIBFASTJSON)
> +LIBFASTJSON_LICENSE := MIT
> +LIBFASTJSON_LICENSE_FILES := \
> + file://COPYING;md5=a958bb07122368f3e1d9b2efe07d231f
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* [ptxdist] [PATCH 6/6] json-glib: add license file and hash
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
` (3 preceding siblings ...)
2023-11-14 11:48 ` [ptxdist] [PATCH 5/6] libfastjson: " Bruno Thomsen
@ 2023-11-14 11:48 ` Bruno Thomsen
2023-11-24 7:28 ` [ptxdist] [APPLIED] " Michael Olbrich
2023-11-24 7:28 ` [ptxdist] [APPLIED] gnutls: " Michael Olbrich
2023-11-24 11:31 ` [ptxdist] [PATCH 1/6] " Roland Hieber
6 siblings, 1 reply; 14+ messages in thread
From: Bruno Thomsen @ 2023-11-14 11:48 UTC (permalink / raw)
To: ptxdist; +Cc: bruno.thomsen
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/json-glib.make | 2 ++
1 file changed, 2 insertions(+)
diff --git a/rules/json-glib.make b/rules/json-glib.make
index d36edc7d2cf6..0a3c7e6bb105 100644
--- a/rules/json-glib.make
+++ b/rules/json-glib.make
@@ -22,6 +22,8 @@ JSON_GLIB_URL := $(call ptx/mirror, GNOME, json-glib/$(basename $(JSON_GLIB_VER
JSON_GLIB_SOURCE := $(SRCDIR)/$(JSON_GLIB).$(JSON_GLIB_SUFFIX)
JSON_GLIB_DIR := $(BUILDDIR)/$(JSON_GLIB)
JSON_GLIB_LICENSE := LGPL-2.1-only
+JSON_GLIB_LICENSE_FILES := \
+ file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34
# ----------------------------------------------------------------------------
# Prepare
--
2.41.0
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [ptxdist] [APPLIED] json-glib: add license file and hash
2023-11-14 11:48 ` [ptxdist] [PATCH 6/6] json-glib: " Bruno Thomsen
@ 2023-11-24 7:28 ` Michael Olbrich
0 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-11-24 7:28 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as dd253889264839f72f8065fd1609e5cc7510aa57.
Michael
[sent from post-receive hook]
On Fri, 24 Nov 2023 08:28:19 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231114114807.23620-6-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/json-glib.make b/rules/json-glib.make
> index d36edc7d2cf6..0a3c7e6bb105 100644
> --- a/rules/json-glib.make
> +++ b/rules/json-glib.make
> @@ -22,6 +22,8 @@ JSON_GLIB_URL := $(call ptx/mirror, GNOME, json-glib/$(basename $(JSON_GLIB_VER
> JSON_GLIB_SOURCE := $(SRCDIR)/$(JSON_GLIB).$(JSON_GLIB_SUFFIX)
> JSON_GLIB_DIR := $(BUILDDIR)/$(JSON_GLIB)
> JSON_GLIB_LICENSE := LGPL-2.1-only
> +JSON_GLIB_LICENSE_FILES := \
> + file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [ptxdist] [APPLIED] gnutls: add license file and hash
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
` (4 preceding siblings ...)
2023-11-14 11:48 ` [ptxdist] [PATCH 6/6] json-glib: " Bruno Thomsen
@ 2023-11-24 7:28 ` Michael Olbrich
2023-11-24 11:31 ` [ptxdist] [PATCH 1/6] " Roland Hieber
6 siblings, 0 replies; 14+ messages in thread
From: Michael Olbrich @ 2023-11-24 7:28 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as fed5d01d34cf669c2c4c63062f4f13de8ed289c9.
Michael
[sent from post-receive hook]
On Fri, 24 Nov 2023 08:28:13 +0100, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20231114114807.23620-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index 5420fd4c2cc9..d49fbd1b17d6 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
> #
> # Paths and names
> #
> -GNUTLS_VERSION := 3.7.7
> -GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2
> -GNUTLS := gnutls-$(GNUTLS_VERSION)
> -GNUTLS_SUFFIX := tar.xz
> -GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
> -GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> -GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> -GNUTLS_LICENSE := LGPL-3.0-or-later
> +GNUTLS_VERSION := 3.7.7
> +GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2
> +GNUTLS := gnutls-$(GNUTLS_VERSION)
> +GNUTLS_SUFFIX := tar.xz
> +GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
> +GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> +GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> +GNUTLS_LICENSE := LGPL-3.0-or-later
> +GNUTLS_LICENSE_FILES := \
> + file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
>
> # ----------------------------------------------------------------------------
> # Prepare
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [ptxdist] [PATCH 1/6] gnutls: add license file and hash
2023-11-14 11:48 [ptxdist] [PATCH 1/6] gnutls: add license file and hash Bruno Thomsen
` (5 preceding siblings ...)
2023-11-24 7:28 ` [ptxdist] [APPLIED] gnutls: " Michael Olbrich
@ 2023-11-24 11:31 ` Roland Hieber
2023-11-27 19:55 ` Bruno Thomsen
6 siblings, 1 reply; 14+ messages in thread
From: Roland Hieber @ 2023-11-24 11:31 UTC (permalink / raw)
To: Bruno Thomsen; +Cc: ptxdist
On Tue, Nov 14, 2023 at 12:48:02PM +0100, Bruno Thomsen wrote:
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
> rules/gnutls.make | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/rules/gnutls.make b/rules/gnutls.make
> index 5420fd4c2cc9..d49fbd1b17d6 100644
> --- a/rules/gnutls.make
> +++ b/rules/gnutls.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
> #
> # Paths and names
> #
> -GNUTLS_VERSION := 3.7.7
> -GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2
> -GNUTLS := gnutls-$(GNUTLS_VERSION)
> -GNUTLS_SUFFIX := tar.xz
> -GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
> -GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> -GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> -GNUTLS_LICENSE := LGPL-3.0-or-later
> +GNUTLS_VERSION := 3.7.7
> +GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2
> +GNUTLS := gnutls-$(GNUTLS_VERSION)
> +GNUTLS_SUFFIX := tar.xz
> +GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
> +GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> +GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> +GNUTLS_LICENSE := LGPL-3.0-or-later
> +GNUTLS_LICENSE_FILES := \
> + file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
The LICENSE only references the LGPL, which is included at
doc/COPYING.LESSER. Please also always include the actual license text
in the md5sum. I'll send a separate patch for this.
- Roland
>
> # ----------------------------------------------------------------------------
> # Prepare
>
> base-commit: 1b6013c068b10a19c116be915cc4fe910ee29b13
> --
> 2.41.0
>
>
>
--
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] 14+ messages in thread* Re: [ptxdist] [PATCH 1/6] gnutls: add license file and hash
2023-11-24 11:31 ` [ptxdist] [PATCH 1/6] " Roland Hieber
@ 2023-11-27 19:55 ` Bruno Thomsen
0 siblings, 0 replies; 14+ messages in thread
From: Bruno Thomsen @ 2023-11-27 19:55 UTC (permalink / raw)
To: Roland Hieber; +Cc: ptxdist
Den fre. 24. nov. 2023 kl. 12.31 skrev Roland Hieber <rhi@pengutronix.de>:
>
> On Tue, Nov 14, 2023 at 12:48:02PM +0100, Bruno Thomsen wrote:
> > Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> > ---
> > rules/gnutls.make | 18 ++++++++++--------
> > 1 file changed, 10 insertions(+), 8 deletions(-)
> >
> > diff --git a/rules/gnutls.make b/rules/gnutls.make
> > index 5420fd4c2cc9..d49fbd1b17d6 100644
> > --- a/rules/gnutls.make
> > +++ b/rules/gnutls.make
> > @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_GNUTLS) += gnutls
> > #
> > # Paths and names
> > #
> > -GNUTLS_VERSION := 3.7.7
> > -GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2
> > -GNUTLS := gnutls-$(GNUTLS_VERSION)
> > -GNUTLS_SUFFIX := tar.xz
> > -GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
> > -GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> > -GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> > -GNUTLS_LICENSE := LGPL-3.0-or-later
> > +GNUTLS_VERSION := 3.7.7
> > +GNUTLS_MD5 := 39e5c71af7f444bdf175094a787843a2
> > +GNUTLS := gnutls-$(GNUTLS_VERSION)
> > +GNUTLS_SUFFIX := tar.xz
> > +GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.7/$(GNUTLS).$(GNUTLS_SUFFIX)
> > +GNUTLS_SOURCE := $(SRCDIR)/$(GNUTLS).$(GNUTLS_SUFFIX)
> > +GNUTLS_DIR := $(BUILDDIR)/$(GNUTLS)
> > +GNUTLS_LICENSE := LGPL-3.0-or-later
> > +GNUTLS_LICENSE_FILES := \
> > + file://LICENSE;md5=71391c8e0c1cfe68077e7fce3b586283
>
> The LICENSE only references the LGPL, which is included at
> doc/COPYING.LESSER. Please also always include the actual license text
> in the md5sum. I'll send a separate patch for this.
Hi Roland,
Thanks for spotting the missing license files.
Yes, I am trying to add the actual license text and hash in the patches I
have been sending lately.
/Bruno
>
> - Roland
>
> >
> > # ----------------------------------------------------------------------------
> > # Prepare
> >
> > base-commit: 1b6013c068b10a19c116be915cc4fe910ee29b13
> > --
> > 2.41.0
> >
> >
> >
>
> --
> 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] 14+ messages in thread