mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH 1/2] usb-modeswitch: version bump 2.5.2 -> 2.6.0
@ 2019-12-06  9:25 Ladislav Michl
  2019-12-06  9:26 ` [ptxdist] [PATCH 2/2] usb-modeswitch-data: version bump 20170806 -> 20191128 Ladislav Michl
  0 siblings, 1 reply; 2+ messages in thread
From: Ladislav Michl @ 2019-12-06  9:25 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 .../0001-Use-system-jimtcl.patch              | 50 -------------------
 patches/usb-modeswitch-2.5.2/series           |  1 -
 rules/usb-modeswitch.in                       |  1 -
 rules/usb-modeswitch.make                     | 25 +++++-----
 4 files changed, 12 insertions(+), 65 deletions(-)
 delete mode 100644 patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch
 delete mode 100644 patches/usb-modeswitch-2.5.2/series

diff --git a/patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch b/patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch
deleted file mode 100644
index 1de216e86..000000000
--- a/patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From aba59dfbd135cd91802c9dccdb5e2b37c377f5ab Mon Sep 17 00:00:00 2001
-From: Ladislav Michl <ladis@linux-mips.org>
-Date: Tue, 11 Sep 2018 19:09:41 +0200
-Subject: [PATCH] Use system jimtcl
-
----
- Makefile | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 463a11f..42c3de6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,6 +3,7 @@ VERS        = 2.5.2
- CC          ?= gcc
- CFLAGS      += -Wall
- LIBS        = `pkg-config --libs --cflags libusb-1.0`
-+JIMTCL      = `pkg-config --libs --cflags jimtcl`
- RM          = /bin/rm -f
- OBJS        = usb_modeswitch.c
- PREFIX      = $(DESTDIR)/usr
-@@ -13,12 +14,8 @@ UDEVDIR     = $(DESTDIR)/lib/udev
- SBINDIR     = $(PREFIX)/sbin
- MANDIR      = $(PREFIX)/share/man/man1
- VPATH       = jimtcl
--HOST_TCL   := $(shell cd jim && ./autosetup/find-tclsh)
--ifeq (,$(findstring jimsh0,$(HOST_TCL)))
--TCL        ?= $(HOST_TCL)
--else
--TCL        ?= /usr/bin/tclsh
--endif
-+HOST_TCL    ?= /usr/bin/tclsh
-+TCL         ?= /usr/bin/tclsh
- JIM_CONFIGURE_OPTS = --disable-lineedit \
- 	--with-out-jim-ext="stdlib posix load signal syslog" --prefix=/usr
- 
-@@ -49,8 +46,8 @@ jim/libjim.a:
- dispatcher-script: usb_modeswitch.tcl
- 	sed 's_!/usr/bin/tclsh_!'"$(TCL)"'_' < usb_modeswitch.tcl > usb_modeswitch_dispatcher
- 
--dispatcher-shared: jim/libjim.so dispatcher.c usb_modeswitch.string
--	$(CC) dispatcher.c $(LDFLAGS) -Ljim -ljim -Ijim -o usb_modeswitch_dispatcher $(CFLAGS)
-+dispatcher-shared: dispatcher.c usb_modeswitch.string
-+	$(CC) dispatcher.c $(LDFLAGS) $(JIMTCL) -o usb_modeswitch_dispatcher $(CFLAGS)
- 
- dispatcher-static: jim/libjim.a dispatcher.c usb_modeswitch.string
- 	$(CC) dispatcher.c $(LDFLAGS) jim/libjim.a -Ijim -o usb_modeswitch_dispatcher $(CFLAGS)
--- 
-2.19.0
-
diff --git a/patches/usb-modeswitch-2.5.2/series b/patches/usb-modeswitch-2.5.2/series
deleted file mode 100644
index cb735aa0d..000000000
--- a/patches/usb-modeswitch-2.5.2/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Use-system-jimtcl.patch
diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in
index dc6105d92..fdd068763 100644
--- a/rules/usb-modeswitch.in
+++ b/rules/usb-modeswitch.in
@@ -5,7 +5,6 @@ menuconfig USB_MODESWITCH
 	prompt "usb-modeswitch                "
 	select LIBUSB
 	select JIMTCL if USB_MODESWITCH_JIM
-	select HOST_JIMTCL if USB_MODESWITCH_JIM
 	help
 	  USB_ModeSwitch is (surprise!) a mode switching tool
 	  for controlling 'multi-mode' USB devices.
diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index 5fbd45d56..111116e98 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION	:= 2.5.2
-USB_MODESWITCH_MD5	:= 16b9a8efa1bf8fbd7d5612757eae4f26
+USB_MODESWITCH_VERSION	:= 2.6.0
+USB_MODESWITCH_MD5	:= be73dcc84025794081a1d4d4e5a75e4c
 USB_MODESWITCH		:= usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX	:= tar.bz2
 USB_MODESWITCH_URL	:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
@@ -27,19 +27,11 @@ USB_MODESWITCH_LICENSE	:= GPL-2.0-only
 # Prepare
 # ----------------------------------------------------------------------------
 
-#
-# autoconf
-#
 USB_MODESWITCH_CONF_TOOL	:= NO
-USB_MODESWITCH_MAKE_ENV		:= \
-	$(CROSS_ENV) \
-	HOST_TCL=$(PTXDIST_SYSROOT_HOST)/bin/jimsh
 USB_MODESWITCH_MAKE_OPT		:= \
 	$(CROSS_ENV_PROGS) \
-	$(call ptx/ifdef,PTXCONF_USB_MODESWITCH_JIM,shared,script)
-USB_MODESWITCH_INSTALL_OPT	:= \
-	UDEVDIR=$(USB_MODESWITCH_PKGDIR)/usr/lib/udev \
-	$(call ptx/ifdef,PTXCONF_USB_MODESWITCH_JIM,install-shared,install-script)
+	$(call ptx/ifdef, PTXCONF_USB_MODESWITCH_JIM, \
+		all-with-dynlink-dispatcher, all-with-script-dispatcher)
 
 # ----------------------------------------------------------------------------
 # Install
@@ -47,7 +39,14 @@ USB_MODESWITCH_INSTALL_OPT	:= \
 
 $(STATEDIR)/usb-modeswitch.install:
 	@$(call targetinfo)
-	@$(call world/install, USB_MODESWITCH)
+	@install -vD -m 755 $(USB_MODESWITCH_DIR)/usb_modeswitch \
+		$(USB_MODESWITCH_PKGDIR)/usr/sbin/usb_modeswitch
+	@install -vD -m 755 $(USB_MODESWITCH_DIR)/usb_modeswitch.sh \
+		$(USB_MODESWITCH_PKGDIR)/usr/lib/udev/usb_modeswitch
+	@install -vD -m 644 $(USB_MODESWITCH_DIR)/usb_modeswitch.conf \
+		$(USB_MODESWITCH_PKGDIR)/etc/usb_modeswitch.conf
+	@install -vD -m 755 $(USB_MODESWITCH_DIR)/usb_modeswitch_dispatcher \
+		$(USB_MODESWITCH_PKGDIR)/usr/sbin/usb_modeswitch_dispatcher
 	@install -vD -m 0644 $(USB_MODESWITCH_DIR)/usb_modeswitch@.service \
 		$(USB_MODESWITCH_PKGDIR)/usr/lib/systemd/system/usb_modeswitch@.service
 	@$(call touch)
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [ptxdist] [PATCH 2/2] usb-modeswitch-data: version bump 20170806 -> 20191128
  2019-12-06  9:25 [ptxdist] [PATCH 1/2] usb-modeswitch: version bump 2.5.2 -> 2.6.0 Ladislav Michl
@ 2019-12-06  9:26 ` Ladislav Michl
  0 siblings, 0 replies; 2+ messages in thread
From: Ladislav Michl @ 2019-12-06  9:26 UTC (permalink / raw)
  To: ptxdist

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/usb-modeswitch-data.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch-data.make b/rules/usb-modeswitch-data.make
index c050868d4..cc1b936f0 100644
--- a/rules/usb-modeswitch-data.make
+++ b/rules/usb-modeswitch-data.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH_DATA) += usb-modeswitch-data
 #
 # Paths and names
 #
-USB_MODESWITCH_DATA_VERSION	:= 20170806
-USB_MODESWITCH_DATA_MD5		:= fb50d15b52e909d742dd16f0a9882316
+USB_MODESWITCH_DATA_VERSION	:= 20191128
+USB_MODESWITCH_DATA_MD5		:= e8fce7eb949cbe16c61fb71bade4cc17
 USB_MODESWITCH_DATA		:= usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION)
 USB_MODESWITCH_DATA_SUFFIX	:= tar.bz2
 USB_MODESWITCH_DATA_URL		:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH_DATA).$(USB_MODESWITCH_DATA_SUFFIX)
-- 
2.24.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-12-06  9:26 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-06  9:25 [ptxdist] [PATCH 1/2] usb-modeswitch: version bump 2.5.2 -> 2.6.0 Ladislav Michl
2019-12-06  9:26 ` [ptxdist] [PATCH 2/2] usb-modeswitch-data: version bump 20170806 -> 20191128 Ladislav Michl

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox