diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2010-04-22 15:58:16 -0300 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-04 21:47:17 +0200 |
| commit | 63b866640957c0e42467914effa7cdc2451e7900 (patch) | |
| tree | e4c2208bbba5393d1f216071dac02c0658c955ea /package | |
| parent | 23ff3c278602bc4531bf8d5de179af188837907e (diff) | |
usb_modeswitch: Bump to version 1.1.2
And correct kconfig dependency.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package')
| -rw-r--r-- | package/usb_modeswitch/Config.in | 1 | ||||
| -rw-r--r-- | package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch | 29 | ||||
| -rw-r--r-- | package/usb_modeswitch/usb_modeswitch-makefile.patch | 23 | ||||
| -rw-r--r-- | package/usb_modeswitch/usb_modeswitch.mk | 17 |
4 files changed, 34 insertions, 36 deletions
diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in index f9fa76e2c..ae10a5550 100644 --- a/package/usb_modeswitch/Config.in +++ b/package/usb_modeswitch/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_USB_MODESWITCH bool "usb_modeswitch" + select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT help USB mode switcher. diff --git a/package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch b/package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch deleted file mode 100644 index 71dbc7a6d..000000000 --- a/package/usb_modeswitch/usb_modeswitch-1.0.7-build-system-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- - Makefile | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -Index: usb_modeswitch-1.0.7/Makefile -=================================================================== ---- usb_modeswitch-1.0.7.orig/Makefile -+++ usb_modeswitch-1.0.7/Makefile -@@ -1,8 +1,8 @@ - PROG = usb_modeswitch - VERS = 1.0.7 - STRIP = strip --CC = gcc --CCFLAGS = -l usb -Wall -+CC ?= gcc -+CFLAGS += -l usb -Wall - RM = /bin/rm -f - OBJS = usb_modeswitch.c - PREFIX = $(DESTDIR)/usr -@@ -12,8 +12,7 @@ - .PHONY: clean - all: $(PROG) - $(PROG): $(OBJS) -- $(CC) $(CCFLAGS) -o $(PROG) $(OBJS) -- $(STRIP) $(PROG) -+ $(CC) $(CFLAGS) -o $(PROG) $(OBJS) - - clean: - $(RM) ./usb_modeswitch diff --git a/package/usb_modeswitch/usb_modeswitch-makefile.patch b/package/usb_modeswitch/usb_modeswitch-makefile.patch new file mode 100644 index 000000000..918200b61 --- /dev/null +++ b/package/usb_modeswitch/usb_modeswitch-makefile.patch @@ -0,0 +1,23 @@ +diff -Nura usb-modeswitch-1.1.2.orig/Makefile usb-modeswitch-1.1.2/Makefile +--- usb-modeswitch-1.1.2.orig/Makefile 2010-04-17 15:27:11.000000000 -0300 ++++ usb-modeswitch-1.1.2/Makefile 2010-04-22 15:05:32.363471807 -0300 +@@ -1,6 +1,6 @@ + PROG = usb_modeswitch + VERS = 1.1.2 +-CC = gcc ++CC ?= gcc + CFLAGS += -Wall -l usb + RM = /bin/rm -f + OBJS = usb_modeswitch.c +@@ -23,8 +23,9 @@ + install: all + install -d $(SBINDIR) + install --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch +- install --mode=755 usb_modeswitch.tcl $(UDEVDIR)/usb_modeswitch +- install --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf ++ #install --mode=755 usb_modeswitch.tcl $(UDEVDIR)/usb_modeswitch ++ #install --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf ++ install -d $(MANDIR) + install --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1 + + diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index d84ccc2bf..620c5d05a 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,23 +4,26 @@ # ############################################################# -USB_MODESWITCH_VERSION = 1.0.7 -USB_MODESWITCH_SOURCE = usb_modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 +USB_MODESWITCH_VERSION = 1.1.2 +USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb-compat define USB_MODESWITCH_BUILD_CMDS - rm $(@D)/usb_modeswitch - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) endef define USB_MODESWITCH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(INSTALL) -D $(@D)/usb_modeswitch.setup -m 0644 \ + $(TARGET_DIR)/etc/usb_modeswitch.setup endef define USB_MODESWITCH_CLEAN_CMDS - rm -f $(TARGET_DIR)/usr/sbin/usb_modeswitch - rm -f $(TARGET_DIR)/etc/usb_modeswitch.conf + rm -f $(TARGET_DIR)/usr/sbin/usb_modeswitch + rm -f $(TARGET_DIR)/etc/usb_modeswitch.setup + rm -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1 endef $(eval $(call GENTARGETS,package,usb_modeswitch)) + |