[ptxdist] [PATCH] usb-modeswitch: version bump 2.4.0 -> 2.5.0

[ptxdist] [PATCH] usb-modeswitch: version bump 2.4.0 -> 2.5.0

[Ladislav Michl]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/usb-modeswitch.make | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index ae2891dfe..0db10dabc 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION	:= 2.4.0
-USB_MODESWITCH_MD5	:= 6e1640db47768bb9012f91b7593116ef
+USB_MODESWITCH_VERSION	:= 2.5.0
+USB_MODESWITCH_MD5	:= 38ad5c9d70e06227a00361bdc2b1e568
 USB_MODESWITCH		:= usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX	:= tar.bz2
 USB_MODESWITCH_URL	:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
@@ -36,6 +36,7 @@ USB_MODESWITCH_CONF_TOOL	:= NO
 USB_MODESWITCH_MAKE_ENV		:= $(CROSS_ENV)
 USB_MODESWITCH_MAKE_OPT		:= $(CROSS_ENV_PROGS)
 USB_MODESWITCH_INSTALL_OPT	:= \
+	DESTDIR=$(USB_MODESWITCH_PKGDIR) \
 	UDEVDIR=$(USB_MODESWITCH_PKGDIR)/usr/lib/udev \
 	install
 
@@ -68,6 +69,8 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
 ifneq ($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),)
 	@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
 		/usr/sbin/usb_modeswitch_dispatcher)
+	@$(call install_copy, usb-modeswitch, 0, 0, 0644, -, \
+		/etc/usb_modeswitch.conf)
 endif
 ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
 	@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
-- 
2.11.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] usb-modeswitch: version bump 2.4.0 -> 2.5.0

[Michael Olbrich]

On Wed, Apr 12, 2017 at 10:34:24PM +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> ---
>  rules/usb-modeswitch.make | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
> index ae2891dfe..0db10dabc 100644
> --- a/rules/usb-modeswitch.make
> +++ b/rules/usb-modeswitch.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
>  #
>  # Paths and names
>  #
> -USB_MODESWITCH_VERSION	:= 2.4.0
> -USB_MODESWITCH_MD5	:= 6e1640db47768bb9012f91b7593116ef
> +USB_MODESWITCH_VERSION	:= 2.5.0
> +USB_MODESWITCH_MD5	:= 38ad5c9d70e06227a00361bdc2b1e568
>  USB_MODESWITCH		:= usb-modeswitch-$(USB_MODESWITCH_VERSION)
>  USB_MODESWITCH_SUFFIX	:= tar.bz2
>  USB_MODESWITCH_URL	:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
> @@ -36,6 +36,7 @@ USB_MODESWITCH_CONF_TOOL	:= NO
>  USB_MODESWITCH_MAKE_ENV		:= $(CROSS_ENV)
>  USB_MODESWITCH_MAKE_OPT		:= $(CROSS_ENV_PROGS)
>  USB_MODESWITCH_INSTALL_OPT	:= \
> +	DESTDIR=$(USB_MODESWITCH_PKGDIR) \

Are you sure this is needed? world/install should add this automatically.
If not, then the bug is elsewhere. Please check the output when building
with '-v'.

>  	UDEVDIR=$(USB_MODESWITCH_PKGDIR)/usr/lib/udev \
>  	install
>  
> @@ -68,6 +69,8 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
>  ifneq ($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),)
>  	@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
>  		/usr/sbin/usb_modeswitch_dispatcher)
> +	@$(call install_copy, usb-modeswitch, 0, 0, 0644, -, \
> +		/etc/usb_modeswitch.conf)

Use install_alternative, it will use the same file as fallback.

Michael

>  endif
>  ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
>  	@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2] usb-modeswitch: version bump 2.4.0 -> 2.5.0

[Ladislav Michl]

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 Changes:
 - v2: drop unecessary DESTDIR
       use install_alternative
 
 rules/usb-modeswitch.make | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make
index ae2891dfe..1eb477610 100644
--- a/rules/usb-modeswitch.make
+++ b/rules/usb-modeswitch.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_USB_MODESWITCH) += usb-modeswitch
 #
 # Paths and names
 #
-USB_MODESWITCH_VERSION	:= 2.4.0
-USB_MODESWITCH_MD5	:= 6e1640db47768bb9012f91b7593116ef
+USB_MODESWITCH_VERSION	:= 2.5.0
+USB_MODESWITCH_MD5	:= 38ad5c9d70e06227a00361bdc2b1e568
 USB_MODESWITCH		:= usb-modeswitch-$(USB_MODESWITCH_VERSION)
 USB_MODESWITCH_SUFFIX	:= tar.bz2
 USB_MODESWITCH_URL	:= http://www.draisberghof.de/usb_modeswitch/$(USB_MODESWITCH).$(USB_MODESWITCH_SUFFIX)
@@ -68,6 +68,8 @@ $(STATEDIR)/usb-modeswitch.targetinstall:
 ifneq ($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),)
 	@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
 		/usr/sbin/usb_modeswitch_dispatcher)
+	@$(call install_alternative, usb-modeswitch, 0, 0, 0644, \
+		/etc/usb_modeswitch.conf)
 endif
 ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER
 	@$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \
-- 
2.11.0

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de