From patchwork Tue Jun 11 15:22:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Ziegler X-Patchwork-Id: 250565 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 06FCC2C0084 for ; Wed, 12 Jun 2013 01:22:34 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6788AA0141; Tue, 11 Jun 2013 15:22:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qaAjZJBWZnRh; Tue, 11 Jun 2013 15:22:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EA873A00C0; Tue, 11 Jun 2013 15:22:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 892CB8F7A4 for ; Tue, 11 Jun 2013 15:22:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 351F489BFD for ; Tue, 11 Jun 2013 15:22:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7ipUivXgShC1 for ; Tue, 11 Jun 2013 15:22:25 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mxz.fh-kl.de (mxz.fh-kl.de [143.93.17.66]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EFB289038 for ; Tue, 11 Jun 2013 15:22:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mxz.fh-kl.de (Postfix) with ESMTP id A8C04C80048 for ; Tue, 11 Jun 2013 17:22:24 +0200 (CEST) X-Virus-Scanned: amavisd-new at fh-kl.de Received: from mxz.fh-kl.de ([127.0.0.1]) by localhost (mxz.fh-kl.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fntViQj5qwc6 for ; Tue, 11 Jun 2013 17:22:20 +0200 (CEST) Received: from mail01.ds.fh-kl.de (mail01.fh-kl.de [143.93.17.114]) by mxz.fh-kl.de (Postfix) with ESMTPS for ; Tue, 11 Jun 2013 17:22:20 +0200 (CEST) Received: from [10.0.23.197] (143.93.17.33) by zwo222-ca01.ds.fh-kl.de (10.0.3.200) with Microsoft SMTP Server (TLS) id 14.2.342.3; Tue, 11 Jun 2013 17:22:20 +0200 Message-ID: <51B740AC.5010406@fh-kl.de> Date: Tue, 11 Jun 2013 17:22:20 +0200 From: Patrick Ziegler User-Agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: X-Enigmail-Version: 1.5.1 X-Originating-IP: [143.93.17.33] Subject: [Buildroot] [PATCH v2] usb_modeswitch: bump to version 1.2.6 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Remove 'usb_modeswitch-makefile.patch' because it was merged upstream. This package contains a dispatcher (wrapper) that can be installed as Tcl script or as binary without further dependency. If Tcl is selected and the binary interpreter is installed (BR2_PACKAGE_TCL && !BR2_PACKAGE_TCL_SHLIB_ONLY) the dispatcher will be installed as Tcl script otherwise as binary. Signed-off-by: Patrick Ziegler --- .../usb_modeswitch/usb_modeswitch-makefile.patch | 31 ---------------------- package/usb_modeswitch/usb_modeswitch.mk | 26 +++++++++++------- 2 files changed, 17 insertions(+), 40 deletions(-) delete mode 100644 package/usb_modeswitch/usb_modeswitch-makefile.patch diff --git a/package/usb_modeswitch/usb_modeswitch-makefile.patch b/package/usb_modeswitch/usb_modeswitch-makefile.patch deleted file mode 100644 index b792741..0000000 --- a/package/usb_modeswitch/usb_modeswitch-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -Removed the -s from the install command. Without this, usb_modeswitch would -fail to install. - -Signed-off-by: J.C. Woltz - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -46,7 +46,7 @@ - cd jim && $(MAKE) distclean - - install-common: all -- install -D -s --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch -+ install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch - install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch - install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf - install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1 -@@ -67,10 +67,10 @@ - install: install-common install-script - - install-shared: dispatcher-dynamic install-common -- install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher -+ install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher - - install-static: dispatcher-static install-common -- install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher -+ install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher - - uninstall: - $(RM) $(SBINDIR)/usb_modeswitch diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk index 92ca163..fe54b50 100644 --- a/package/usb_modeswitch/usb_modeswitch.mk +++ b/package/usb_modeswitch/usb_modeswitch.mk @@ -4,19 +4,32 @@ # ################################################################################ -USB_MODESWITCH_VERSION = 1.2.5 +USB_MODESWITCH_VERSION = 1.2.6 USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch USB_MODESWITCH_DEPENDENCIES = libusb-compat USB_MODESWITCH_LICENSE = GPLv2+ USB_MODESWITCH_LICENSE_FILES = COPYING +USB_MODESWITCH_BUILD_TARGETS = static +USB_MODESWITCH_INSTALL_TARGETS = install-static + +ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y) + USB_MODESWITCH_DEPENDENCIES += tcl + USB_MODESWITCH_BUILD_TARGETS = script + USB_MODESWITCH_INSTALL_TARGETS = install-script +endif + define USB_MODESWITCH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \ + -C $(@D) $(USB_MODESWITCH_BUILD_TARGETS) endef define USB_MODESWITCH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ + DESTDIR=$(TARGET_DIR) \ + -C $(@D) $(USB_MODESWITCH_INSTALL_TARGETS) endef @@ -25,12 +38,7 @@ define USB_MODESWITCH_CLEAN_CMDS endef define USB_MODESWITCH_UNINSTALL_CMDS - $(RM) -f $(TARGET_DIR)/usr/sbin/usb_modeswitch - $(RM) -f $(TARGET_DIR)/lib/udev/usb_modeswitch - $(RM) -f $(TARGET_DIR)/etc/usb_modeswitch.setup - $(RM) -f $(TARGET_DIR)/usr/share/man/man1/usb_modeswitch.1 - $(RM) -rf $(TARGET_DIR)/var/lib/usb_modeswitch - $(RM) -f $(TARGET_DIR)/usr/sbin/usb_modeswitch_dispatcher + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) uninstall endef $(eval $(generic-package))