[ptxdist] [PATCH 1/4] stm32flash: add license files and correct spdx license identifier

[ptxdist] [PATCH 1/4] stm32flash: add license files and correct spdx license identifier

[Bruno Thomsen]

Use GPL-2.0-only spdx license identifier.

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

diff --git a/rules/stm32flash.make b/rules/stm32flash.make
index 26176bf20..f25e28a8f 100644
--- a/rules/stm32flash.make
+++ b/rules/stm32flash.make
@@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_STM32FLASH) += stm32flash
 #
 # Paths and names
 #
-STM32FLASH_VERSION	:= 0.5
-STM32FLASH_SUFFIX	:= tar.gz
-STM32FLASH_MD5		:= 40f673502949f3bb655d2bcc539d7b6a
-STM32FLASH		:= stm32flash-$(STM32FLASH_VERSION)
-STM32FLASH_URL		:= $(call ptx/mirror, SF, stm32flash/$(STM32FLASH).$(STM32FLASH_SUFFIX))
-STM32FLASH_DIR		:= $(BUILDDIR)/$(STM32FLASH)
-STM32FLASH_SOURCE	:= $(SRCDIR)/$(STM32FLASH).$(STM32FLASH_SUFFIX)
-STM32FLASH_LICENSE	:= GPLv2
+STM32FLASH_VERSION		:= 0.5
+STM32FLASH_SUFFIX		:= tar.gz
+STM32FLASH_MD5			:= 40f673502949f3bb655d2bcc539d7b6a
+STM32FLASH			:= stm32flash-$(STM32FLASH_VERSION)
+STM32FLASH_URL			:= $(call ptx/mirror, SF, stm32flash/$(STM32FLASH).$(STM32FLASH_SUFFIX))
+STM32FLASH_DIR			:= $(BUILDDIR)/$(STM32FLASH)
+STM32FLASH_SOURCE		:= $(SRCDIR)/$(STM32FLASH).$(STM32FLASH_SUFFIX)
+STM32FLASH_LICENSE		:= GPL-2.0-only
+STM32FLASH_LICENSE_FILES	:= \
+	file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263
 
 
 # ----------------------------------------------------------------------------

base-commit: f61905c23240642dec3e5390ee15e83cf1e016e9
-- 
2.49.0

[ptxdist] [PATCH 2/4] serdisplib: add license files and correct spdx license identifier

[Bruno Thomsen]

Use GPL-2.0-only spdx license identifier.

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

diff --git a/rules/serdisplib.make b/rules/serdisplib.make
index 40928eea3..25ea3936c 100644
--- a/rules/serdisplib.make
+++ b/rules/serdisplib.make
@@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_SERDISPLIB) += serdisplib
 #
 # Paths and names
 #
-SERDISPLIB_VERSION	:= 1.97.9
-SERDISPLIB_MD5		:= 130552ec60d01e974712a60274f34de7
-SERDISPLIB		:= serdisplib-$(SERDISPLIB_VERSION)
-SERDISPLIB_SUFFIX	:= tar.gz
-SERDISPLIB_URL		:= $(call ptx/mirror, SF, project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX))
-SERDISPLIB_SOURCE	:= $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX)
-SERDISPLIB_DIR		:= $(BUILDDIR)/$(SERDISPLIB)
-SERDISPLIB_LICENSE	:= GPL
-
+SERDISPLIB_VERSION		:= 1.97.9
+SERDISPLIB_MD5			:= 130552ec60d01e974712a60274f34de7
+SERDISPLIB			:= serdisplib-$(SERDISPLIB_VERSION)
+SERDISPLIB_SUFFIX		:= tar.gz
+SERDISPLIB_URL			:= $(call ptx/mirror, SF, project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX))
+SERDISPLIB_SOURCE		:= $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX)
+SERDISPLIB_DIR			:= $(BUILDDIR)/$(SERDISPLIB)
+SERDISPLIB_LICENSE		:= GPL-2.0-only
+SERDISPLIB_LICENSE_FILES	:= \
+	file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.49.0

[ptxdist] [PATCH 3/4] wavemon: add license files and correct spdx license identifier

[Bruno Thomsen]

Use GPL-3.0-only spdx license identifier.

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

diff --git a/rules/wavemon.make b/rules/wavemon.make
index e56506767..ab6c77482 100644
--- a/rules/wavemon.make
+++ b/rules/wavemon.make
@@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_WAVEMON) += wavemon
 #
 # Paths and names
 #
-WAVEMON_VERSION	:= 0.7.5
-WAVEMON_MD5	:= 77d4a0f099ca98cf98a915adc70694ba
-WAVEMON		:= wavemon-$(WAVEMON_VERSION)
-WAVEMON_SUFFIX	:= tar.bz2
-WAVEMON_URL	:= https://github.com/uoaerg/wavemon/releases/download/v$(WAVEMON_VERSION)/$(WAVEMON).$(WAVEMON_SUFFIX)
-WAVEMON_SOURCE	:= $(SRCDIR)/$(WAVEMON).$(WAVEMON_SUFFIX)
-WAVEMON_DIR	:= $(BUILDDIR)/$(WAVEMON)
-WAVEMON_LICENSE	:= GPL
+WAVEMON_VERSION		:= 0.7.5
+WAVEMON_MD5		:= 77d4a0f099ca98cf98a915adc70694ba
+WAVEMON			:= wavemon-$(WAVEMON_VERSION)
+WAVEMON_SUFFIX		:= tar.bz2
+WAVEMON_URL		:= https://github.com/uoaerg/wavemon/releases/download/v$(WAVEMON_VERSION)/$(WAVEMON).$(WAVEMON_SUFFIX)
+WAVEMON_SOURCE		:= $(SRCDIR)/$(WAVEMON).$(WAVEMON_SUFFIX)
+WAVEMON_DIR		:= $(BUILDDIR)/$(WAVEMON)
+WAVEMON_LICENSE		:= GPL-3.0-only
+WAVEMON_LICENSE_FILES	:= \
+	file://COPYING;md5=d32239bcb673463ab874e80d47fae504
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.49.0

[ptxdist] [PATCH 4/4] tomoyo-tools: add license files and correct spdx license identifier

[Bruno Thomsen]

Use GPL-2.0-only spdx license identifier.

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

diff --git a/rules/tomoyo-tools.make b/rules/tomoyo-tools.make
index 32a5cae99..09a275865 100644
--- a/rules/tomoyo-tools.make
+++ b/rules/tomoyo-tools.make
@@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_TOMOYO_TOOLS) += tomoyo-tools
 #
 # Paths and names
 #
-TOMOYO_TOOLS_VERSION	:= 2.5.0-20130406
-TOMOYO_TOOLS_MD5	:= 8888f83fcb87823d714ff551e8680d0d
-TOMOYO_TOOLS		:= tomoyo-tools-$(TOMOYO_TOOLS_VERSION)
-TOMOYO_TOOLS_SUFFIX	:= tar.gz
-TOMOYO_TOOLS_URL	:= http://jaist.dl.sourceforge.jp/tomoyo/53357/$(TOMOYO_TOOLS).$(TOMOYO_TOOLS_SUFFIX)
-TOMOYO_TOOLS_SOURCE	:= $(SRCDIR)/$(TOMOYO_TOOLS).$(TOMOYO_TOOLS_SUFFIX)
-TOMOYO_TOOLS_DIR	:= $(BUILDDIR)/tomoyo-tools
-TOMOYO_TOOLS_LICENSE	:= GPL
+TOMOYO_TOOLS_VERSION		:= 2.5.0-20130406
+TOMOYO_TOOLS_MD5		:= 8888f83fcb87823d714ff551e8680d0d
+TOMOYO_TOOLS			:= tomoyo-tools-$(TOMOYO_TOOLS_VERSION)
+TOMOYO_TOOLS_SUFFIX		:= tar.gz
+TOMOYO_TOOLS_URL		:= http://jaist.dl.sourceforge.jp/tomoyo/53357/$(TOMOYO_TOOLS).$(TOMOYO_TOOLS_SUFFIX)
+TOMOYO_TOOLS_SOURCE		:= $(SRCDIR)/$(TOMOYO_TOOLS).$(TOMOYO_TOOLS_SUFFIX)
+TOMOYO_TOOLS_DIR		:= $(BUILDDIR)/tomoyo-tools
+TOMOYO_TOOLS_LICENSE		:= GPL-2.0-only
+TOMOYO_TOOLS_LICENSE_FILES	:= \
+	file://COPYING.tomoyo;md5=751419260aa954499f7abaabaa882bbe
 
 # ----------------------------------------------------------------------------
 # Prepare
-- 
2.49.0

Re: [ptxdist] [PATCH 2/4] serdisplib: add license files and correct spdx license identifier

[Michael Olbrich]

On Mon, Apr 14, 2025 at 10:07:02PM +0200, Bruno Thomsen wrote:
> Use GPL-2.0-only spdx license identifier.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/serdisplib.make | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/rules/serdisplib.make b/rules/serdisplib.make
> index 40928eea3..25ea3936c 100644
> --- a/rules/serdisplib.make
> +++ b/rules/serdisplib.make
> @@ -14,15 +14,16 @@ PACKAGES-$(PTXCONF_SERDISPLIB) += serdisplib
>  #
>  # Paths and names
>  #
> -SERDISPLIB_VERSION	:= 1.97.9
> -SERDISPLIB_MD5		:= 130552ec60d01e974712a60274f34de7
> -SERDISPLIB		:= serdisplib-$(SERDISPLIB_VERSION)
> -SERDISPLIB_SUFFIX	:= tar.gz
> -SERDISPLIB_URL		:= $(call ptx/mirror, SF, project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX))
> -SERDISPLIB_SOURCE	:= $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX)
> -SERDISPLIB_DIR		:= $(BUILDDIR)/$(SERDISPLIB)
> -SERDISPLIB_LICENSE	:= GPL
> -
> +SERDISPLIB_VERSION		:= 1.97.9
> +SERDISPLIB_MD5			:= 130552ec60d01e974712a60274f34de7
> +SERDISPLIB			:= serdisplib-$(SERDISPLIB_VERSION)
> +SERDISPLIB_SUFFIX		:= tar.gz
> +SERDISPLIB_URL			:= $(call ptx/mirror, SF, project/serdisplib/serdisplib/$(SERDISPLIB_VERSION)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX))
> +SERDISPLIB_SOURCE		:= $(SRCDIR)/$(SERDISPLIB).$(SERDISPLIB_SUFFIX)
> +SERDISPLIB_DIR			:= $(BUILDDIR)/$(SERDISPLIB)
> +SERDISPLIB_LICENSE		:= GPL-2.0-only

Hmm, I'm seeing a lot of "... or (at your option) any later version" in the
code. Are you sure that GPL-2.0-only is correct here and not
GPL-2.0-or-later?

Michael

> +SERDISPLIB_LICENSE_FILES	:= \
> +	file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.49.0
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH 1/4] stm32flash: add license files and correct spdx license identifier

[Michael Olbrich]

On Mon, Apr 14, 2025 at 10:07:01PM +0200, Bruno Thomsen wrote:
> Use GPL-2.0-only spdx license identifier.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/stm32flash.make | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/stm32flash.make b/rules/stm32flash.make
> index 26176bf20..f25e28a8f 100644
> --- a/rules/stm32flash.make
> +++ b/rules/stm32flash.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_STM32FLASH) += stm32flash
>  #
>  # Paths and names
>  #
> -STM32FLASH_VERSION	:= 0.5
> -STM32FLASH_SUFFIX	:= tar.gz
> -STM32FLASH_MD5		:= 40f673502949f3bb655d2bcc539d7b6a
> -STM32FLASH		:= stm32flash-$(STM32FLASH_VERSION)
> -STM32FLASH_URL		:= $(call ptx/mirror, SF, stm32flash/$(STM32FLASH).$(STM32FLASH_SUFFIX))
> -STM32FLASH_DIR		:= $(BUILDDIR)/$(STM32FLASH)
> -STM32FLASH_SOURCE	:= $(SRCDIR)/$(STM32FLASH).$(STM32FLASH_SUFFIX)
> -STM32FLASH_LICENSE	:= GPLv2
> +STM32FLASH_VERSION		:= 0.5
> +STM32FLASH_SUFFIX		:= tar.gz
> +STM32FLASH_MD5			:= 40f673502949f3bb655d2bcc539d7b6a
> +STM32FLASH			:= stm32flash-$(STM32FLASH_VERSION)
> +STM32FLASH_URL			:= $(call ptx/mirror, SF, stm32flash/$(STM32FLASH).$(STM32FLASH_SUFFIX))
> +STM32FLASH_DIR			:= $(BUILDDIR)/$(STM32FLASH)
> +STM32FLASH_SOURCE		:= $(SRCDIR)/$(STM32FLASH).$(STM32FLASH_SUFFIX)
> +STM32FLASH_LICENSE		:= GPL-2.0-only

Same here, maybe GPL-2.0-or-later instead?

Michael


> +STM32FLASH_LICENSE_FILES	:= \
> +	file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263
>  
>  
>  # ----------------------------------------------------------------------------
> 
> base-commit: f61905c23240642dec3e5390ee15e83cf1e016e9
> -- 
> 2.49.0
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [ptxdist] [PATCH 3/4] wavemon: add license files and correct spdx license identifier

[Michael Olbrich]

On Mon, Apr 14, 2025 at 10:07:03PM +0200, Bruno Thomsen wrote:
> Use GPL-3.0-only spdx license identifier.
> 
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> ---
>  rules/wavemon.make | 18 ++++++++++--------
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/wavemon.make b/rules/wavemon.make
> index e56506767..ab6c77482 100644
> --- a/rules/wavemon.make
> +++ b/rules/wavemon.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_WAVEMON) += wavemon
>  #
>  # Paths and names
>  #
> -WAVEMON_VERSION	:= 0.7.5
> -WAVEMON_MD5	:= 77d4a0f099ca98cf98a915adc70694ba
> -WAVEMON		:= wavemon-$(WAVEMON_VERSION)
> -WAVEMON_SUFFIX	:= tar.bz2
> -WAVEMON_URL	:= https://github.com/uoaerg/wavemon/releases/download/v$(WAVEMON_VERSION)/$(WAVEMON).$(WAVEMON_SUFFIX)
> -WAVEMON_SOURCE	:= $(SRCDIR)/$(WAVEMON).$(WAVEMON_SUFFIX)
> -WAVEMON_DIR	:= $(BUILDDIR)/$(WAVEMON)
> -WAVEMON_LICENSE	:= GPL
> +WAVEMON_VERSION		:= 0.7.5
> +WAVEMON_MD5		:= 77d4a0f099ca98cf98a915adc70694ba
> +WAVEMON			:= wavemon-$(WAVEMON_VERSION)
> +WAVEMON_SUFFIX		:= tar.bz2
> +WAVEMON_URL		:= https://github.com/uoaerg/wavemon/releases/download/v$(WAVEMON_VERSION)/$(WAVEMON).$(WAVEMON_SUFFIX)
> +WAVEMON_SOURCE		:= $(SRCDIR)/$(WAVEMON).$(WAVEMON_SUFFIX)
> +WAVEMON_DIR		:= $(BUILDDIR)/$(WAVEMON)
> +WAVEMON_LICENSE		:= GPL-3.0-only

This is a bit of a mess:

- So the code header for this version says "... either version 2, or (at
  your option) any later version".
- COPYING contains GPLv3.
- The help text says GPLv3.
- Upstream changed the code headers to GPLv3 or later.

So I think GPL-3.0-or-later makes the most sense here.

Michael


> +WAVEMON_LICENSE_FILES	:= \
> +	file://COPYING;md5=d32239bcb673463ab874e80d47fae504
>  
>  # ----------------------------------------------------------------------------
>  # Prepare
> -- 
> 2.49.0
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |