* [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info
@ 2021-09-22 8:31 Chris Packham
2021-09-22 8:31 ` [Buildroot] [PATCH 2/2] package/micropython: Bump version to 1.17 Chris Packham
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Chris Packham @ 2021-09-22 8:31 UTC (permalink / raw)
To: buildroot; +Cc: Chris Packham
The various micropython ports may include code licensed under different
licenses compared to the core micropython. List these in MICROPYTHON_LICENSE.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
package/micropython/micropython.mk | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
index fa28da9be3..7a752efd69 100644
--- a/package/micropython/micropython.mk
+++ b/package/micropython/micropython.mk
@@ -6,7 +6,10 @@
MICROPYTHON_VERSION = 1.14
MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION))
-MICROPYTHON_LICENSE = MIT
+MICROPYTHON_LICENSE = MIT, Apache-2.0, BSD-1-clause, BSD-3-clause, BSD-4-clause, \
+ GPL-2.0 with FreeRTOS exception, GPL-2.0+, GPL-2.0, LGPL-3.0-only, \
+ MCD-ST Liberty SW License Agreement V2, MIT + BSD-3-clause, OFL-1.1, \
+ PJRC.COM, Zlib
MICROPYTHON_LICENSE_FILES = LICENSE
MICROPYTHON_DEPENDENCIES = host-pkgconf libffi $(BR2_PYTHON3_HOST_DEPENDENCY)
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] package/micropython: Bump version to 1.17
2021-09-22 8:31 [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Chris Packham
@ 2021-09-22 8:31 ` Chris Packham
2021-09-26 20:59 ` [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Arnout Vandecappelle
2021-10-06 12:45 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Chris Packham @ 2021-09-22 8:31 UTC (permalink / raw)
To: buildroot; +Cc: Chris Packham
Update to micropython-1.17. The LICENSE text has been updated to reflect
the licenses used for various libraries and ports, update the hash
accordingly.
Signed-off-by: Chris Packham <judge.packham@gmail.com>
---
package/micropython/micropython.hash | 4 ++--
package/micropython/micropython.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/micropython/micropython.hash b/package/micropython/micropython.hash
index fe47ee09c4..d5045e8f27 100644
--- a/package/micropython/micropython.hash
+++ b/package/micropython/micropython.hash
@@ -1,3 +1,3 @@
#locally computed
-sha256 542eb120df8d9eb6f200bcd856294e143813adea9dda0d7189405c218d4b16f7 micropython-1.14.tar.gz
-sha256 9c6089e26c8638a0645bcb0db2c85051f82de8022dcd07fb22baa0c5f9362085 LICENSE
+sha256 c21dbf8144237b3dbe3847c9ad5264cd0f3104eb078c810b3986004cce8fcd70 micropython-1.17.tar.gz
+sha256 59b1f0947a87c90d0d29dbe2c8deb3d1f8263bbbd2fb5ebcc79a649cff6dfcba LICENSE
diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
index 7a752efd69..5dc044239c 100644
--- a/package/micropython/micropython.mk
+++ b/package/micropython/micropython.mk
@@ -4,7 +4,7 @@
#
################################################################################
-MICROPYTHON_VERSION = 1.14
+MICROPYTHON_VERSION = 1.17
MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION))
MICROPYTHON_LICENSE = MIT, Apache-2.0, BSD-1-clause, BSD-3-clause, BSD-4-clause, \
GPL-2.0 with FreeRTOS exception, GPL-2.0+, GPL-2.0, LGPL-3.0-only, \
--
2.33.0
_______________________________________________
buildroot mailing list
buildroot@lists.buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info
2021-09-22 8:31 [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Chris Packham
2021-09-22 8:31 ` [Buildroot] [PATCH 2/2] package/micropython: Bump version to 1.17 Chris Packham
@ 2021-09-26 20:59 ` Arnout Vandecappelle
2021-10-06 12:45 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2021-09-26 20:59 UTC (permalink / raw)
To: Chris Packham, buildroot
On 22/09/2021 10:31, Chris Packham wrote:
> The various micropython ports may include code licensed under different
> licenses compared to the core micropython. List these in MICROPYTHON_LICENSE.
>
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
> ---
> package/micropython/micropython.mk | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/package/micropython/micropython.mk b/package/micropython/micropython.mk
> index fa28da9be3..7a752efd69 100644
> --- a/package/micropython/micropython.mk
> +++ b/package/micropython/micropython.mk
> @@ -6,7 +6,10 @@
>
> MICROPYTHON_VERSION = 1.14
> MICROPYTHON_SITE = $(call github,micropython,micropython,v$(MICROPYTHON_VERSION))
> -MICROPYTHON_LICENSE = MIT
> +MICROPYTHON_LICENSE = MIT, Apache-2.0, BSD-1-clause, BSD-3-clause, BSD-4-clause, \
> + GPL-2.0 with FreeRTOS exception, GPL-2.0+, GPL-2.0, LGPL-3.0-only, \
> + MCD-ST Liberty SW License Agreement V2, MIT + BSD-3-clause, OFL-1.1, \
> + PJRC.COM, Zlib
Actually, we don't use most of those in the Unix build. So I've checked
everything and stripped it down the ones we really do use, which is just BSD-1c,
BSD-3c and Zlib in addition to MIT.
Applied both to master with that fixed.
Regards,
Arnout
> MICROPYTHON_LICENSE_FILES = LICENSE
> MICROPYTHON_DEPENDENCIES = host-pkgconf libffi $(BR2_PYTHON3_HOST_DEPENDENCY)
>
>
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info
2021-09-22 8:31 [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Chris Packham
2021-09-22 8:31 ` [Buildroot] [PATCH 2/2] package/micropython: Bump version to 1.17 Chris Packham
2021-09-26 20:59 ` [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Arnout Vandecappelle
@ 2021-10-06 12:45 ` Peter Korsgaard
2 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2021-10-06 12:45 UTC (permalink / raw)
To: Chris Packham; +Cc: buildroot
>>>>> "Chris" == Chris Packham <judge.packham@gmail.com> writes:
> The various micropython ports may include code licensed under different
> licenses compared to the core micropython. List these in MICROPYTHON_LICENSE.
> Signed-off-by: Chris Packham <judge.packham@gmail.com>
Committed to 2021.02.x, 2021.05.x and 2021.08.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-06 12:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 8:31 [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Chris Packham
2021-09-22 8:31 ` [Buildroot] [PATCH 2/2] package/micropython: Bump version to 1.17 Chris Packham
2021-09-26 20:59 ` [Buildroot] [PATCH 1/2] package/micropython: Update LICENSE info Arnout Vandecappelle
2021-10-06 12:45 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).