usb_modeswitch: upgrade to 1.2.3

PATCH New J.C. Woltz 3 participants 6 messages Feb 9, 2012 – Feb 11, 2012

lore

Share & tools

lore

J.C. Woltz

author

2012-02-09 23:42 UTC #0 lore raw

PATCH 1/1 usb_modeswitch: upgrade to 1.2.3

From: "J.C. Woltz" <[email protected]>

Signed-off-by J.C. Woltz <[email protected]>

---
 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(-)

package/usb_modeswitch/Config.in +1 -0

index ae10a55..1228293 100644
@@ -7,3 +7,4 @@ config BR2_PACKAGE_USB_MODESWITCH
 	  Used to switch mode on multiple-function devices
 
 	  http://www.draisberghof.de/usb_modeswitch/
+

package/usb_modeswitch/usb_modeswitch-makefile.patch +18 ~~-21~~

index 918200b..1c4715c 100644
@@ -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

package/usb_modeswitch/usb_modeswitch.mk +5 -5

index 7b982d8..3d03888 100644
@@ -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

Signature · 1 line

1.7.5.4

Thomas De Schampheleire

2012-02-10 07:29 UTC #1 lore raw

PATCH 1/1 usb_modeswitch: upgrade to 1.2.3

Hello,

Quoted 3 lines · J.C. Woltz

From: "J.C. Woltz" <[email protected]>
Signed-off-by J.C. Woltz <[email protected]>

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

Quoted 13 lines

---
?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(-)
package/usb_modeswitch/Config.in +0 -0
index ae10a55..1228293 100644
@@ -7,3 +7,4 @@ config BR2_PACKAGE_USB_MODESWITCH
? ? ? ? ?Used to switch mode on multiple-function devices

Quoted 2 lines

? ? ? ? ?http://www.draisberghof.de/usb_modeswitch/ +

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

Quoted 60 lines

package/usb_modeswitch/usb_modeswitch-makefile.patch +18 ~~-21~~

index 918200b..1c4715c 100644
@@ -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

package/usb_modeswitch/usb_modeswitch.mk +0 -0

index 7b982d8..3d03888 100644
@@ -4,22 +4,22 @@

?# ?#############################################################

package/usb_modeswitch/usb_modeswitch.mk +1 -1

-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

Quoted 4 lines

?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 ?

Quoted 8 lines

?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

Quoted 7 lines

+
?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

J.C. Woltz

author

2012-02-10 14:28 UTC #2 lore raw

PATCH 1/1 usb_modeswitch: upgrade to 1.2.3

Quoted 11 lines · Thomas De Schampheleire

Hello,
Quoted 3 lines · J.C. Woltz
From: "J.C. Woltz" <[email protected]>
Signed-off-by J.C. Woltz <[email protected]>
You shouldn't include a From: line. The Signed-off-by: is the one that should be present.

Will fix.

Quoted 36 lines

package/usb_modeswitch/Config.in config BR2_PACKAGE_USB_MODESWITCH · line 10
Quoted 8 lines
package/usb_modeswitch/Config.in +1 -0
@@ -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.
Will remove, accidental change.
Review
Quoted 1 line
(quoted diff) +0 -0
usb_modeswitch.mk
Quoted 7 lines
index 7b982d8..3d03888 100644
package/usb_modeswitch/usb_modeswitch.mk +0 -0
@@ -4,22 +4,22 @@
 #
 #############################################################
 
package/usb_modeswitch/usb_modeswitch.mk line 14
Quoted 10 lines
package/usb_modeswitch/usb_modeswitch.mk +2 -2
-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?

Quoted 5 lines

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

Yes, I changed that line since usb_modeswitch would not compile. I was following the example from:
http://buildroot.uclibc.org/buildroot.html#generic-tutorial

Please let me know how or what you want changed, and I will re-submit.

Thank you,
J.C. Woltz
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20120210/a21eecc3/attachment.html>

Thomas De Schampheleire

2012-02-10 16:41 UTC #3 lore raw

PATCH 1/1 usb_modeswitch: upgrade to 1.2.3

Quoted 60 lines · J.C. Woltz

Quoted 11 lines · Thomas De Schampheleire
Hello,
Quoted 3 lines · J.C. Woltz
From: "J.C. Woltz" <[email protected]>
Signed-off-by J.C. Woltz <[email protected]>
You shouldn't include a From: line. The Signed-off-by: is the one that should be present.
Will fix.
Quoted 7 lines
Quoted 7 lines
package/usb_modeswitch/Config.in +0 -0
@@ -7,3 +7,4 @@ config BR2_PACKAGE_USB_MODESWITCH
? ? ? ? ?Used to switch mode on multiple-function devices
Quoted 5 lines
Quoted 2 lines
? ? ? ? ?http://www.draisberghof.de/usb_modeswitch/ +
Why is this change needed? I think it should be removed from the patch.
Will remove, accidental change.
Quoted 24 lines
Quoted 17 lines
package/usb_modeswitch/usb_modeswitch.mk +0 -0
index 7b982d8..3d03888 100644
@@ -4,22 +4,22 @@
?# ?#############################################################
package/usb_modeswitch/usb_modeswitch.mk +1 -1
-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
Quoted 4 lines
?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?
Quoted 4 lines
And to other buildroot developers: what is the policy regarding directly specifying CC and LD, instead of using variables like TARGET_CONFIGURE_OPTS ?

Quoted 5 lines

Yes, I changed that line since usb_modeswitch would not compile. I was following the example from:
http://buildroot.uclibc.org/buildroot.html#generic-tutorial
Please let me know how or what you want changed, and I will re-submit.

I checked and this is caused because your Makefile patch removed the CC ?= gcc
change.

Personally I don't mind your solution, as it is one less change to the Makefile.
For me, you don't need to change it.

Best regards,
Thomas

Arnout Vandecappelle

2012-02-11 16:24 UTC #4 lore raw

PATCH 1/1 usb_modeswitch: upgrade to 1.2.3

Quoted 13 lines · On Friday 10 February 2012 17:41:04 Thomas De Schampheleire wrote:

Quoted 7 lines
Quoted 6 lines
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 ?
Quoted 5 lines
Yes, I changed that line since usb_modeswitch would not compile. I was following the example from:
http://buildroot.uclibc.org/buildroot.html#generic-tutorial
Please let me know how or what you want changed, and I will re-submit.

Quoted 7 lines

I checked and this is caused because your Makefile patch removed the CC ?= gcc
change.
Personally I don't mind your solution, as it is one less change to the Makefile.
For me, you don't need to change it.

J.C.'s solution is preferred, I would say.

- It doesn't require patching.

- It's how it is documented.

- TARGET_CONFIGURE_OPTIONS is meant for autoconf.

- This will be the way that the MAKETARGETS infrastructure will be implemented.

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F

Arnout Vandecappelle

2012-02-11 16:30 UTC #5 lore raw

PATCH 1/1 usb_modeswitch: upgrade to 1.2.3

In reply to J.C. Woltz

package/usb_modeswitch/usb_modeswitch.mk line 14

Quoted 4 lines · On Friday 10 February 2012 00:42:36 J.C. Woltz wrote:

define USB_MODESWITCH_BUILD_CMDS
package/usb_modeswitch/usb_modeswitch.mk +1 -1
-       $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+       $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D)
 endef

Don't remove TARGET_MAKE_ENV. The CC= is good, however.

package/usb_modeswitch/usb_modeswitch.mk line 18

Quoted 7 lines

define USB_MODESWITCH_INSTALL_TARGET_CMDS

package/usb_modeswitch/usb_modeswitch.mk +1 -3

-       $(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

Same here.

Quoted 1 line

+

Redundant whitespace.

Quoted 5 lines

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

Actually, the rm -f lines should be in UNINSTALL_CMDS. And should use
$(RM) instead of rm -f.

Regards,
Arnout

Signature · 6 lines

Arnout Vandecappelle                               arnout at mind be
Senior Embedded Software Architect                 +32-16-286540
Essensium/Mind                                     http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium                BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F