diff options
| author | Ladislav Michl <ladis@linux-mips.org> | 2019-12-06 10:25:37 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-01-23 17:08:35 +0100 |
| commit | 73cea6eeb466cc5acaff214d77854150f4f9c02d (patch) | |
| tree | cbfd4d97b4e4b8a8e51a58a24461d683e4189c38 /patches | |
| parent | ce8070824d1d3e71e7e429d2dcfbc89b3265349f (diff) | |
| download | ptxdist-73cea6eeb466cc5acaff214d77854150f4f9c02d.tar.gz ptxdist-73cea6eeb466cc5acaff214d77854150f4f9c02d.tar.xz | |
usb-modeswitch: version bump 2.5.2 -> 2.6.0
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/usb-modeswitch-2.5.2/0001-Use-system-jimtcl.patch | 50 | ||||
| -rw-r--r-- | patches/usb-modeswitch-2.5.2/series | 1 |
2 files changed, 0 insertions, 51 deletions
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 |