package/tcl: update license to SPDX format

PATCH New Romain Naour 3 participants 7 messages Apr 20, 2018 – May 1, 2018

lore

Share & tools

lore

Romain Naour

author

2018-04-20 08:28 UTC #0 lore raw

PATCH v2 1/3 package/tcl: update license to SPDX format

While at it add the license file hash.

Signed-off-by Romain Naour <[email protected]>

---
 package/tcl/tcl.hash | 1 +
 package/tcl/tcl.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

package/tcl/tcl.hash +1 -0

index b344d26..359b543 100644
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07  tcl8.6.6-src.tar.gz
+sha256 c0a69a2bfd757361ec7e6143973b103c90409316b49e9c88db26ad6388e79f16  license.terms

package/tcl/tcl.mk +1 -1

index ffef9cf..b9fb7af 100644
@@ -8,7 +8,7 @@ TCL_VERSION_MAJOR = 8.6
 TCL_VERSION = $(TCL_VERSION_MAJOR).6
 TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz
 TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION)
-TCL_LICENSE = tcl license
+TCL_LICENSE = TCL
 TCL_LICENSE_FILES = license.terms
 TCL_SUBDIR = unix
 TCL_INSTALL_STAGING = YES

Signature · 1 line

2.7.4

Romain Naour

author

2018-04-20 08:29 UTC #1 lore raw

PATCH v2 2/3 package/tcllib: update license to SPDX format

While at it add the license file hash.

Signed-off-by Romain Naour <[email protected]>

---
 package/tcllib/tcllib.hash | 1 +
 package/tcllib/tcllib.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

package/tcllib/tcllib.hash +1 -0

index eb990a2..d08b5a1 100644
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  0db9e17d6c0f44d3ca2df2ea5023e35c0f3767e7008c3cb26d201446eb68add1  tcllib-1.13.tar.bz2
+sha256  530ec70eb11a455bd582d86b6d74c2dd7cc367d90b8bbdd59fcb43ae02f95a4b  license.terms

package/tcllib/tcllib.mk +1 -1

index bd98dd6..dfa35c8 100644
@@ -7,7 +7,7 @@
 TCLLIB_VERSION = 1.13
 TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2
 TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION)
-TCLLIB_LICENSE = tcl license
+TCLLIB_LICENSE = TCL
 TCLLIB_LICENSE_FILES = license.terms
 TCLLIB_DEPENDENCIES = host-tcl
 TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/bin/tclsh$(TCL_VERSION_MAJOR)"

Signature · 1 line

2.7.4

Peter Korsgaard

2018-05-01 06:55 UTC #2 lore raw

PATCH v2 2/3 package/tcllib: update license to SPDX format

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
While at it add the license file hash.
Signed-off-by Romain Naour <[email protected]>

Committed to 2018.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard

Romain Naour

author

2018-04-20 08:29 UTC #3 lore raw

PATCH v2 3/3 package/tk: new package

In reply to Romain Naour

Use the same version as tcl package.

Signed-off-by Romain Naour <[email protected]>

---
tcl and tk should be updated together.

v2: use SPDX license format

---
 DEVELOPERS           |  1 +
 package/Config.in    |  1 +
 package/tk/Config.in | 18 ++++++++++++++++++
 package/tk/tk.hash   |  3 +++
 package/tk/tk.mk     | 31 +++++++++++++++++++++++++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 package/tk/Config.in
 create mode 100644 package/tk/tk.hash
 create mode 100644 package/tk/tk.mk

DEVELOPERS +1 -0

index 3bb5f32..63361b6 100644
@@ -1617,6 +1617,7 @@ F:	package/stress-ng/
 F:	package/supertux/
 F:	package/supertuxkart/
 F:	package/terminology/
+F:	package/tk/
 F:	package/upower/
 F:	package/xenomai/

package/Config.in +1 -0

index ddbbcff..ecd9b8f 100644
@@ -302,6 +302,7 @@ comment "Graphic libraries"
 	source "package/sdl2_mixer/Config.in"
 	source "package/sdl2_net/Config.in"
 	source "package/sdl2_ttf/Config.in"
+	source "package/tk/Config.in"
 
 comment "Other GUIs"
 	source "package/qt/Config.in"

package/tk/Config.in new file +18 -0

new file mode 100644
index 0000000..507b0bf
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_TK
+	bool "tk"
+	depends on BR2_USE_MMU # tcl
+	depends on BR2_TOOLCHAIN_HAS_THREADS # tcl
+	depends on !BR2_STATIC_LIBS # tcl
+	depends on BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_TCL
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XLIB_LIBXFT
+	help
+	  A windowing toolkit for use with tcl
+
+	  http://www.tcl.tk
+
+comment "tk needs a toolchain w/ threads, dynamic library"
+	depends on BR2_USE_MMU
+	depends on BR2_PACKAGE_XORG7
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

package/tk/tk.hash new file +3 -0

new file mode 100644
index 0000000..5fc0b6f
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d  tk8.6.6-src.tar.gz
+sha256 2cde822b93ca16ae535c954b7dfe658b4ad10df2a193628d1b358f1765e8b198  license.terms

package/tk/tk.mk new file +31 -0

new file mode 100644
index 0000000..102d368
@@ -0,0 +1,31 @@
+################################################################################
+#
+# tk
+#
+################################################################################
+
+TK_VERSION_MAJOR = 8.6
+TK_VERSION = $(TK_VERSION_MAJOR).6
+TK_SOURCE = tk$(TK_VERSION)-src.tar.gz
+TK_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TK_VERSION)
+TK_LICENSE = TCL
+TK_LICENSE_FILES = license.terms
+TK_SUBDIR = unix
+TK_INSTALL_STAGING = YES
+
+TK_DEPENDENCIES = tcl xlib_libX11 xlib_libXft
+
+# hopefully our strtod is not buggy
+TK_CONF_ENV = tcl_cv_strtod_buggy=no
+
+TK_CONF_OPTS = --disable-rpath \
+	--with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix \
+	--x-includes=$(STAGING_DIR)/usr/include \
+	--x-libraries=$(STAGING_DIR)/usr/lib
+
+define TK_WISH_SYMLINK
+	ln -sf /usr/bin/wish$(TK_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/wish
+endef
+TK_POST_INSTALL_TARGET_HOOKS += TK_WISH_SYMLINK
+
+$(eval $(autotools-package))

Signature · 1 line

2.7.4

Thomas Petazzoni

2018-04-20 08:58 UTC #4 lore raw

PATCH v2 3/3 package/tk: new package

Hello,

Quoted 5 lines · Romain Naour

Use the same version as tcl package.
Signed-off-by Romain Naour <[email protected]>
---
tcl and tk should be updated together.

Perhaps it would be useful to add a comment both in tcl.mk and tk.mk near the VERSION variable, to let people know that when one is updated, the other should be updated as well.

To be done as a follow-up patch :)

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Thomas Petazzoni

2018-04-20 08:57 UTC #5 lore raw

PATCH v2 1/3 package/tcl: update license to SPDX format

In reply to Romain Naour

Hello,

Quoted 7 lines · Romain Naour

While at it add the license file hash.
Signed-off-by Romain Naour <[email protected]>
---
 package/tcl/tcl.hash | 1 +
 package/tcl/tcl.mk   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Entire series applied to master. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Peter Korsgaard

2018-05-01 06:55 UTC #6 lore raw

PATCH v2 1/3 package/tcl: update license to SPDX format

In reply to Romain Naour

Quoted 4 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Romain" == Romain Naour <[email protected]> writes:
While at it add the license file hash.
Signed-off-by Romain Naour <[email protected]>

Committed to 2018.02.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard