From: J.C. Woltz <jwoltz@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] [PATCH] usb_modeswitch: upgrade to 1.2.3
Date: Thu, 9 Feb 2012 18:42:36 -0500 [thread overview]
Message-ID: <1328830956-11154-1-git-send-email-jwoltz@gmail.com> (raw)
From: "J.C. Woltz" <jwoltz@gmail.com>
Signed-off-by: J.C. Woltz <jwoltz@gmail.com>
---
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/
+
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
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
--
1.7.5.4
next reply other threads:[~2012-02-09 23:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 23:42 J.C. Woltz [this message]
2012-02-10 7:29 ` [Buildroot] [PATCH] [PATCH] usb_modeswitch: upgrade to 1.2.3 Thomas De Schampheleire
2012-02-10 14:28 ` J.C. Woltz
2012-02-10 16:41 ` Thomas De Schampheleire
2012-02-11 16:24 ` Arnout Vandecappelle
2012-02-11 16:30 ` Arnout Vandecappelle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1328830956-11154-1-git-send-email-jwoltz@gmail.com \
--to=jwoltz@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.