[ptxdist] [PATCH v3] strace: Version bump 5.9 -> 5.15

[ptxdist] [PATCH v3] strace: Version bump 5.9 -> 5.15

[Christian Melki]

Maintenance.

Adjust licence to include GPL-2.0 and an exception for the syscall headers.
Add missing COPYING file for the bundled uapi linux kernel headers.
Add missing GPL-2.0 license file for the bundled uapi linux kernel headers.
Update md5sum for the strace COPYING, copyright year and a notice
about the bundled header has been changed/added.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/strace.make | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rules/strace.make b/rules/strace.make
index 6c15f1baa..aa13f3e97 100644
--- a/rules/strace.make
+++ b/rules/strace.make
@@ -16,19 +16,20 @@ PACKAGES-$(PTXCONF_STRACE) += strace
 #
 # Paths and names
 #
-STRACE_VERSION	:= 5.9
-STRACE_MD5	:= fef7264b3501c6af86224c685751d0c6
+STRACE_VERSION	:= 5.15
+STRACE_MD5	:= a627c23fda3ecd668d6161c288fdcd79
 STRACE		:= strace-$(STRACE_VERSION)
 STRACE_SUFFIX	:= tar.xz
 STRACE_URL	:= https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)
 STRACE_SOURCE	:= $(SRCDIR)/$(STRACE).$(STRACE_SUFFIX)
 STRACE_DIR	:= $(BUILDDIR)/$(STRACE)
-STRACE_LICENSE	:= LGPL-2.1-or-later
+STRACE_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-only WITH Linux-syscall-note
 STRACE_LICENSE_FILES := \
-	file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c \
+	file://COPYING;md5=318cfc887fc8723f4e9d4709b55e065b \
+	file://bundled/linux/COPYING;md5=391c7a5bbfb151ad3dbe0a7fb5791a46 \
+	file://bundled/linux/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
 	file://LGPL-2.1-or-later;md5=9e4c7a7a5be83d7f3da645ac5d466052
 
-
 # ----------------------------------------------------------------------------
 # Prepare
 # ----------------------------------------------------------------------------
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] strace: Version bump 5.9 -> 5.15

[Michael Olbrich]

Thanks, applied as 1e06afec4a3c5aa069f3272261b64af6ef2fff4e.

Michael

[sent from post-receive hook]

On Fri, 21 Jan 2022 08:19:23 +0100, Christian Melki <christian.melki@t2data.com> wrote:
> Maintenance.
> 
> Adjust licence to include GPL-2.0 and an exception for the syscall headers.
> Add missing COPYING file for the bundled uapi linux kernel headers.
> Add missing GPL-2.0 license file for the bundled uapi linux kernel headers.
> Update md5sum for the strace COPYING, copyright year and a notice
> about the bundled header has been changed/added.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20220107084303.4189730-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/strace.make b/rules/strace.make
> index 6c15f1baa7c1..aa13f3e97863 100644
> --- a/rules/strace.make
> +++ b/rules/strace.make
> @@ -16,19 +16,20 @@ PACKAGES-$(PTXCONF_STRACE) += strace
>  #
>  # Paths and names
>  #
> -STRACE_VERSION	:= 5.9
> -STRACE_MD5	:= fef7264b3501c6af86224c685751d0c6
> +STRACE_VERSION	:= 5.15
> +STRACE_MD5	:= a627c23fda3ecd668d6161c288fdcd79
>  STRACE		:= strace-$(STRACE_VERSION)
>  STRACE_SUFFIX	:= tar.xz
>  STRACE_URL	:= https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)
>  STRACE_SOURCE	:= $(SRCDIR)/$(STRACE).$(STRACE_SUFFIX)
>  STRACE_DIR	:= $(BUILDDIR)/$(STRACE)
> -STRACE_LICENSE	:= LGPL-2.1-or-later
> +STRACE_LICENSE	:= LGPL-2.1-or-later AND GPL-2.0-only WITH Linux-syscall-note
>  STRACE_LICENSE_FILES := \
> -	file://COPYING;md5=c756d9d5dabc27663df64f0bf492166c \
> +	file://COPYING;md5=318cfc887fc8723f4e9d4709b55e065b \
> +	file://bundled/linux/COPYING;md5=391c7a5bbfb151ad3dbe0a7fb5791a46 \
> +	file://bundled/linux/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 \
>  	file://LGPL-2.1-or-later;md5=9e4c7a7a5be83d7f3da645ac5d466052
>  
> -
>  # ----------------------------------------------------------------------------
>  # Prepare
>  # ----------------------------------------------------------------------------

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de