Skip to contentSkip to conversation

package/usb_modeswitch: fix license

PATCH New Fabrice Fontaine 2 participants 4 messages Dec 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/usb_modeswitch: fix license

dispatcher.c is licensed under BSD-2-Clause

---
 package/usb_modeswitch/usb_modeswitch.hash | 1 +
 package/usb_modeswitch/usb_modeswitch.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
package/usb_modeswitch/usb_modeswitch.hash +1 -0
index 3cbd370e2c..0b180f9789 100644
@@ -1,3 +1,4 @@
 # Locally calculated
 sha256	abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6  usb-modeswitch-2.5.2.tar.bz2
 sha256	32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
+sha256	929bfd332292f8cd33e4401b5cedea3e93ebe6efa99e1d3626884cacb59ff208  dispatcher.c
package/usb_modeswitch/usb_modeswitch.mk +2 -2
index 9832d3c808..5b60a3c5dc 100644
@@ -8,8 +8,8 @@ USB_MODESWITCH_VERSION = 2.5.2
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb
-USB_MODESWITCH_LICENSE = GPL-2.0+
-USB_MODESWITCH_LICENSE_FILES = COPYING
+USB_MODESWITCH_LICENSE = BSD-2-Clause (dispatcher.c), GPL-2.0+ (usb_modeswitch{.c,.h,.sh,_dispatcher.tcl})
+USB_MODESWITCH_LICENSE_FILES = COPYING dispatcher.c
 # Package does not build in parallel due to improper make rules
 USB_MODESWITCH_MAKE = $(MAKE1)
 
Signature · 1 line
2.24.0
#1 lore raw

PATCH 2/3 package/usb_modeswitch: bump to version 2.6.0

- Drop first patch (not needed anymore) and all jimtcl related workarounds as embedded jimtcl has been removed
- Parallel build issue has been fixed
- Update hash of COPYING as this file has been updated to reflect that dispatcher.c is under BSD-2-Clause
- Drop dispatcher.c from license files as COPYING has been updated

Full ChangeLog: http://www.draisberghof.de/usb_modeswitch/ChangeLog

---
 ...xtra-configure-flags-to-be-passed-to.patch | 29 -------------------
 package/usb_modeswitch/Config.in              |  1 +
 package/usb_modeswitch/usb_modeswitch.hash    |  5 ++--
 package/usb_modeswitch/usb_modeswitch.mk      | 27 +++++++----------
 4 files changed, 14 insertions(+), 48 deletions(-)
 delete mode 100644 package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch
package/usb_modeswitch/0001-Makefile-allow-extra-configure-flags-to-be-passed-to.patch deleted +0 -29
deleted file mode 100644
index 9e1e681fa5..0000000000
@@ -1,29 +0,0 @@
-From 1309df373c882f27f476130b06746a6d1e1a0f85 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Fri, 3 Nov 2017 23:21:44 +0100
-Subject: [PATCH] Makefile: allow extra configure flags to be passed to jimtcl
- on the make command line
-
-E.G. to pass --host / --build for cross compilation.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a151e2a..94dabd9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ TCL        ?= $(HOST_TCL)
- else
- TCL        ?= /usr/bin/tclsh
- endif
--JIM_CONFIGURE_OPTS = --disable-lineedit \
-+override JIM_CONFIGURE_OPTS += --disable-lineedit \
- 	--with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr
- 
- .PHONY: clean install install-common uninstall \
--- 
-2.11.0
-
package/usb_modeswitch/Config.in +1 -0
index f709a550c1..579761c040 100644
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_USB_MODESWITCH
 	bool "usb_modeswitch"
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
+	select BR2_PACKAGE_JIMTCL if !BR2_PACKAGE_TCL || BR2_PACKAGE_TCL_SHLIB_ONLY
 	select BR2_PACKAGE_LIBUSB
 	help
 	  Some USB devices such as 3G/4G broadband modems power-up
package/usb_modeswitch/usb_modeswitch.hash +2 -3
index 0b180f9789..049c40468e 100644
@@ -1,4 +1,3 @@
 # Locally calculated
-sha256	abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6  usb-modeswitch-2.5.2.tar.bz2
-sha256	32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
-sha256	929bfd332292f8cd33e4401b5cedea3e93ebe6efa99e1d3626884cacb59ff208  dispatcher.c
+sha256	c215236e6bada6e659fc195a31d611ea298a4bdb4d57a0d68c553b56585f8ba3  usb-modeswitch-2.6.0.tar.bz2
+sha256	6195429209313925c0eba6c0da4ee7a6cb4277b99e35c886913f80f91ec20b94  COPYING
package/usb_modeswitch/usb_modeswitch.mk +11 -16
index 5b60a3c5dc..0825cff938 100644
@@ -4,35 +4,30 @@
 #
 ################################################################################
 
-USB_MODESWITCH_VERSION = 2.5.2
+USB_MODESWITCH_VERSION = 2.6.0
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb
 USB_MODESWITCH_LICENSE = BSD-2-Clause (dispatcher.c), GPL-2.0+ (usb_modeswitch{.c,.h,.sh,_dispatcher.tcl})
-USB_MODESWITCH_LICENSE_FILES = COPYING dispatcher.c
-# Package does not build in parallel due to improper make rules
-USB_MODESWITCH_MAKE = $(MAKE1)
+USB_MODESWITCH_LICENSE_FILES = COPYING
 
 ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y)
 USB_MODESWITCH_DEPENDENCIES += tcl
-USB_MODESWITCH_BUILD_TARGETS = script
+USB_MODESWITCH_BUILD_TARGETS = all
 USB_MODESWITCH_INSTALL_TARGETS = install-script
 else
-USB_MODESWITCH_BUILD_TARGETS = static
-USB_MODESWITCH_INSTALL_TARGETS = install-static
+USB_MODESWITCH_DEPENDENCIES += jimtcl
+ifeq ($(BR2_STATIC_LIBS),y)
+USB_MODESWITCH_BUILD_TARGETS = all-with-statlink-dispatcher
+USB_MODESWITCH_INSTALL_TARGETS = install-statlink
+else
+USB_MODESWITCH_BUILD_TARGETS = all-with-dynlink-dispatcher
+USB_MODESWITCH_INSTALL_TARGETS = install-dynlink
+endif
 endif
-
-# build system of embedded jimtcl doesn't use autotools, but does use
-# an old version of gnuconfig which doesn't know all the architectures
-# supported by Buildroot, so update config.guess / config.sub like we
-# do in pkg-autotools.mk
-USB_MODESWITCH_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
 
 define USB_MODESWITCH_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \
-		$(if $(BR2_INSTALL_LIBSTDCPP),,CXX=false) \
-		CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \
-		JIM_CONFIGURE_OPTS="--host=$(GNU_TARGET_NAME) --build=$(GNU_HOST_NAME)" \
 		-C $(@D) $(USB_MODESWITCH_BUILD_TARGETS)
 endef
 
Signature · 1 line
2.24.0
#2 lore raw

PATCH 3/3 package/usb_modeswitch_data: bump to version 20191128

In reply to Fabrice Fontaine
---
 package/usb_modeswitch_data/usb_modeswitch_data.hash | 2 +-
 package/usb_modeswitch_data/usb_modeswitch_data.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/usb_modeswitch_data/usb_modeswitch_data.hash +1 -1
index f35fd69a8b..d2518e32d9 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256	ce413ef2a50e648e9c81bc3ea6110e7324a8bf981034fc9ec4467d3562563c2c  usb-modeswitch-data-20170806.tar.bz2
+sha256	3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9  usb-modeswitch-data-20191128.tar.bz2
 sha256	32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
package/usb_modeswitch_data/usb_modeswitch_data.mk +1 -1
index 80ecd33d85..a3a98ad7e7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-USB_MODESWITCH_DATA_VERSION = 20170806
+USB_MODESWITCH_DATA_VERSION = 20191128
 USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2
 USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch
Signature · 1 line
2.24.0
#3 lore raw

PATCH 1/3 package/usb_modeswitch: fix license

In reply to Fabrice Fontaine

Fabrice, All,

On 2019-12-22 12:06 +0100, Fabrice Fontaine spake thusly:

Quoted 3 lines

dispatcher.c is licensed under BSD-2-Clause

Series aplied, thanks. However, I did a few changes, see belos:

- I merged patches 1 and 2 to gether, as I did not see the point of

    adding tweaking the licensing info twice;

- speakign of the licensing info, I simplified the license list: we usually only list parts of the package affected by the different licenses, when those parts are optional or clearly separated (like libs vs. programs), which is not the case here; we do not differentiate based on the source files affecte by the licenses;

- I added the md5 hash provided by upstream. md5 is a weak hash, but it is provided by upstream, so we want to carry it.

Thanks.

Regards,
Yann E. MORIN.

Quoted 36 lines
---
 package/usb_modeswitch/usb_modeswitch.hash | 1 +
 package/usb_modeswitch/usb_modeswitch.mk   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
package/usb_modeswitch/usb_modeswitch.hash +1 -0
index 3cbd370e2c..0b180f9789 100644
@@ -1,3 +1,4 @@
 # Locally calculated
 sha256	abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6  usb-modeswitch-2.5.2.tar.bz2
 sha256	32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING
+sha256	929bfd332292f8cd33e4401b5cedea3e93ebe6efa99e1d3626884cacb59ff208  dispatcher.c
package/usb_modeswitch/usb_modeswitch.mk +2 -2
index 9832d3c808..5b60a3c5dc 100644
@@ -8,8 +8,8 @@ USB_MODESWITCH_VERSION = 2.5.2
 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2
 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch
 USB_MODESWITCH_DEPENDENCIES = libusb
-USB_MODESWITCH_LICENSE = GPL-2.0+
-USB_MODESWITCH_LICENSE_FILES = COPYING
+USB_MODESWITCH_LICENSE = BSD-2-Clause (dispatcher.c), GPL-2.0+ (usb_modeswitch{.c,.h,.sh,_dispatcher.tcl})
+USB_MODESWITCH_LICENSE_FILES = COPYING dispatcher.c
 # Package does not build in parallel due to improper make rules
 USB_MODESWITCH_MAKE = $(MAKE1)
 
Signature · 6 lines
2.24.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'