[Buildroot] [PATCH] [PATCH] usb_modeswitch: upgrade to 1.2.3

Thomas De Schampheleire patrickdepinguin+buildroot at gmail.com
Fri Feb 10 07:29:09 UTC 2012


Hello,

On Fri, Feb 10, 2012 at 12:42 AM, J.C. Woltz <jwoltz at gmail.com> wrote:
> From: "J.C. Woltz" <jwoltz at gmail.com>
>
> Signed-off-by: J.C. Woltz <jwoltz at gmail.com>

You shouldn't include a From: line. The Signed-off-by: is the one that
should be present.


> ---
>  package/usb_modeswitch/Config.in                   |    1 +
>  .../usb_modeswitch/usb_modeswitch-makefile.patch   |   39 +++++++++-----------
>  package/usb_modeswitch/usb_modeswitch.mk           |   10 +++---
>  3 files changed, 24 insertions(+), 26 deletions(-)
>
> diff --git a/package/usb_modeswitch/Config.in b/package/usb_modeswitch/Config.in
> index ae10a55..1228293 100644
> --- a/package/usb_modeswitch/Config.in
> +++ b/package/usb_modeswitch/Config.in
> @@ -7,3 +7,4 @@ config BR2_PACKAGE_USB_MODESWITCH
>          Used to switch mode on multiple-function devices
>
>          http://www.draisberghof.de/usb_modeswitch/
> +

Why is this change needed? I think it should be removed from the patch.

> diff --git a/package/usb_modeswitch/usb_modeswitch-makefile.patch b/package/usb_modeswitch/usb_modeswitch-makefile.patch
> index 918200b..1c4715c 100644
> --- a/package/usb_modeswitch/usb_modeswitch-makefile.patch
> +++ b/package/usb_modeswitch/usb_modeswitch-makefile.patch
> @@ -1,23 +1,20 @@
> -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
> +--- usb_modeswitch-1.2.3.orig/Makefile.orig    2012-02-06 14:00:15.000000000 -0500
> ++++ usb_modeswitch-1.2.3/Makefile      2012-02-06 14:01:13.000000000 -0500
> +@@ -46,7 +46,7 @@
> +       cd jim && $(MAKE) distclean
>
> + install-common:
> +-      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
> +@@ -65,7 +65,7 @@
> +       install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
> +
> + install-binary:
> +-      install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
> ++      install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
> +
> + install: all install-common install-script
>
> diff --git a/package/usb_modeswitch/usb_modeswitch.mk b/package/usb_modeswitch/usb_modeswitch.mk
> index 7b982d8..3d03888 100644
> --- a/package/usb_modeswitch/usb_modeswitch.mk
> +++ b/package/usb_modeswitch/usb_modeswitch.mk
> @@ -4,22 +4,22 @@
>  #
>  #############################################################
>
> -USB_MODESWITCH_VERSION = 1.1.2
> +USB_MODESWITCH_VERSION = 1.2.3
>  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
> -       $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
> +       $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)
>  endef

Is there a particular reason why you changed this?

And to other buildroot developers: what is the policy regarding
directly specifying CC and LD, instead of using variables like
TARGET_CONFIGURE_OPTS ?

>
>  define USB_MODESWITCH_INSTALL_TARGET_CMDS
> -       $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
> -       $(INSTALL) -D $(@D)/usb_modeswitch.setup -m 0644 \
> -               $(TARGET_DIR)/etc/usb_modeswitch.setup
> +       $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
>  endef
>
> +
>  define USB_MODESWITCH_CLEAN_CMDS
> +       $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) clean
>        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
> --

Best regards,
Thomas


More information about the buildroot mailing list