* [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 @ 2016-01-22 0:24 Ladislav Michl 2016-01-22 13:38 ` [ptxdist] [PATCH] usb_modeswitch: udev helper Ladislav Michl 2016-02-11 11:24 ` [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 Michael Olbrich 0 siblings, 2 replies; 6+ messages in thread From: Ladislav Michl @ 2016-01-22 0:24 UTC (permalink / raw) To: ptxdist Also update help to match official description. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- rules/usb-modeswitch.in | 3 ++- rules/usb-modeswitch.make | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in index 555d8a7..aaefd86 100644 --- a/rules/usb-modeswitch.in +++ b/rules/usb-modeswitch.in @@ -5,6 +5,7 @@ config USB_MODESWITCH prompt "usb-modeswitch" select LIBUSB help - Activating switchable USB devices on Linux. + USB_ModeSwitch is (surprise!) a mode switching tool + for controlling 'multi-mode' USB devices. # vim: set sw=8 ts=8 noet ft=kconfig: diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make index d6a0a82..4ebf0e8 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.2.1 -USB_MODESWITCH_MD5 := 46cd7fa937655ab2df616c1d5dfb121e +USB_MODESWITCH_VERSION := 2.3.0 +USB_MODESWITCH_MD5 := 7faf7dccd50b3ca8aaa16fcb5bf0dc2f 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) -- 2.1.4 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH] usb_modeswitch: udev helper 2016-01-22 0:24 [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 Ladislav Michl @ 2016-01-22 13:38 ` Ladislav Michl 2016-01-22 15:10 ` Michael Olbrich 2016-02-11 11:24 ` [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 Michael Olbrich 1 sibling, 1 reply; 6+ messages in thread From: Ladislav Michl @ 2016-01-22 13:38 UTC (permalink / raw) To: ptxdist Install also udev helper and systemd service file Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- rules/usb-modeswitch.in | 20 +++++++++++++++++--- rules/usb-modeswitch.make | 13 +++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in index aaefd86..28ba777 100644 --- a/rules/usb-modeswitch.in +++ b/rules/usb-modeswitch.in @@ -1,11 +1,25 @@ ## SECTION=shell_and_console -config USB_MODESWITCH - tristate - prompt "usb-modeswitch" +menuconfig USB_MODESWITCH + tristate "usb-modeswitch " select LIBUSB + select TCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT help USB_ModeSwitch is (surprise!) a mode switching tool for controlling 'multi-mode' USB devices. +if USB_MODESWITCH + +config USB_MODESWITCH_UDEV_HELPER + bool "install udev helper" + default y + depends on UDEV + +config USB_MODESWITCH_SYSTEMD_UNIT + bool "install systemd unit file" + default y + depends on SYSTEMD + +endif + # vim: set sw=8 ts=8 noet ft=kconfig: diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make index 4ebf0e8..3f558f7 100644 --- a/rules/usb-modeswitch.make +++ b/rules/usb-modeswitch.make @@ -51,6 +51,19 @@ $(STATEDIR)/usb-modeswitch.targetinstall: @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ /usr/sbin/usb_modeswitch) +ifneq ($(or $(PTXCONF_USB_MODESWITCH_UDEV_HELPER) $(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT)),) + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ + /usr/sbin/usb_modeswitch_dispatcher) +endif +ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ + /lib/udev/usb_modeswitch) +endif +ifdef PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT + @$(call install_copy, usb-modeswitch, 0, 0, 0644, \ + $(USB_MODESWITCH_DIR)/usb_modeswitch@.service, \ + /lib/systemd/system/usb_modeswitch@.service) +endif @$(call install_finish, usb-modeswitch) -- 2.1.4 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] usb_modeswitch: udev helper 2016-01-22 13:38 ` [ptxdist] [PATCH] usb_modeswitch: udev helper Ladislav Michl @ 2016-01-22 15:10 ` Michael Olbrich 2016-01-22 16:27 ` [ptxdist] [PATCH v2] " Ladislav Michl 0 siblings, 1 reply; 6+ messages in thread From: Michael Olbrich @ 2016-01-22 15:10 UTC (permalink / raw) To: ptxdist On Fri, Jan 22, 2016 at 02:38:55PM +0100, Ladislav Michl wrote: > Install also udev helper and systemd service file > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > --- > rules/usb-modeswitch.in | 20 +++++++++++++++++--- > rules/usb-modeswitch.make | 13 +++++++++++++ > 2 files changed, 30 insertions(+), 3 deletions(-) > > diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in > index aaefd86..28ba777 100644 > --- a/rules/usb-modeswitch.in > +++ b/rules/usb-modeswitch.in > @@ -1,11 +1,25 @@ > ## SECTION=shell_and_console > > -config USB_MODESWITCH > - tristate > - prompt "usb-modeswitch" > +menuconfig USB_MODESWITCH > + tristate "usb-modeswitch " > select LIBUSB > + select TCL if USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT select TCL if (USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT) && RUNTIME > help > USB_ModeSwitch is (surprise!) a mode switching tool > for controlling 'multi-mode' USB devices. > > +if USB_MODESWITCH > + > +config USB_MODESWITCH_UDEV_HELPER > + bool "install udev helper" > + default y > + depends on UDEV > + > +config USB_MODESWITCH_SYSTEMD_UNIT > + bool "install systemd unit file" > + default y > + depends on SYSTEMD > + > +endif > + > # vim: set sw=8 ts=8 noet ft=kconfig: > diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make > index 4ebf0e8..3f558f7 100644 > --- a/rules/usb-modeswitch.make > +++ b/rules/usb-modeswitch.make > @@ -51,6 +51,19 @@ $(STATEDIR)/usb-modeswitch.targetinstall: > > @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ > /usr/sbin/usb_modeswitch) > +ifneq ($(or $(PTXCONF_USB_MODESWITCH_UDEV_HELPER) $(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT)),) ifneq ($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),) should be enough. > + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ > + /usr/sbin/usb_modeswitch_dispatcher) > +endif > +ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER > + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ > + /lib/udev/usb_modeswitch) > +endif > +ifdef PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT > + @$(call install_copy, usb-modeswitch, 0, 0, 0644, \ > + $(USB_MODESWITCH_DIR)/usb_modeswitch@.service, \ > + /lib/systemd/system/usb_modeswitch@.service) Avoid accessing <PKG>_DIR in targetinstall. It may not be available. Either patch the makefile or write a install stage that copies the file to $(<PKG>_PKGDIR)/lib/systemd/system/usb_modeswitch@.service Michael > +endif > > @$(call install_finish, usb-modeswitch) > > -- > 2.1.4 > > > _______________________________________________ > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [ptxdist] [PATCH v2] usb_modeswitch: udev helper 2016-01-22 15:10 ` Michael Olbrich @ 2016-01-22 16:27 ` Ladislav Michl 2016-02-11 11:25 ` Michael Olbrich 0 siblings, 1 reply; 6+ messages in thread From: Ladislav Michl @ 2016-01-22 16:27 UTC (permalink / raw) To: ptxdist Install also udev helper and systemd service file Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- Changelog: - select TCL also depends on RUNTIME - simplify 'or' in makefile's ifdef - targetinstall file from pkgdir, not srcdir (all above pointed by Michael Olbrich, thanks!) rules/usb-modeswitch.in | 20 +++++++++++++++++--- rules/usb-modeswitch.make | 24 ++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in index aaefd86..3ccf31f 100644 --- a/rules/usb-modeswitch.in +++ b/rules/usb-modeswitch.in @@ -1,11 +1,25 @@ ## SECTION=shell_and_console -config USB_MODESWITCH - tristate - prompt "usb-modeswitch" +menuconfig USB_MODESWITCH + tristate "usb-modeswitch " select LIBUSB + select TCL if (USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT) && RUNTIME help USB_ModeSwitch is (surprise!) a mode switching tool for controlling 'multi-mode' USB devices. +if USB_MODESWITCH + +config USB_MODESWITCH_UDEV_HELPER + bool "install udev helper" + default y + depends on UDEV + +config USB_MODESWITCH_SYSTEMD_UNIT + bool "install systemd unit file" + default y + depends on SYSTEMD + +endif + # vim: set sw=8 ts=8 noet ft=kconfig: diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make index 4ebf0e8..95149a3 100644 --- a/rules/usb-modeswitch.make +++ b/rules/usb-modeswitch.make @@ -37,6 +37,18 @@ USB_MODESWITCH_MAKE_ENV := $(CROSS_ENV) USB_MODESWITCH_MAKE_OPT := $(CROSS_ENV_PROGS) # ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/usb-modeswitch.install: + @$(call targetinfo) + @$(call world/install, USB_MODESWITCH) + @mkdir -p $(USB_MODESWITCH_PKGDIR)/lib/systemd/system + @install -m 0644 $(USB_MODESWITCH_DIR)/usb_modeswitch@.service \ + $(USB_MODESWITCH_PKGDIR)/lib/systemd/system/usb_modeswitch@.service + @$(call touch) + +# ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -51,6 +63,18 @@ $(STATEDIR)/usb-modeswitch.targetinstall: @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ /usr/sbin/usb_modeswitch) +ifneq ($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),) + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ + /usr/sbin/usb_modeswitch_dispatcher) +endif +ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ + /lib/udev/usb_modeswitch) +endif +ifdef PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT + @$(call install_copy, usb-modeswitch, 0, 0, 0644, -, \ + /lib/systemd/system/usb_modeswitch@.service) +endif @$(call install_finish, usb-modeswitch) -- 2.1.4 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH v2] usb_modeswitch: udev helper 2016-01-22 16:27 ` [ptxdist] [PATCH v2] " Ladislav Michl @ 2016-02-11 11:25 ` Michael Olbrich 0 siblings, 0 replies; 6+ messages in thread From: Michael Olbrich @ 2016-02-11 11:25 UTC (permalink / raw) To: ptxdist On Fri, Jan 22, 2016 at 05:27:58PM +0100, Ladislav Michl wrote: > Install also udev helper and systemd service file > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Thanks, applied. Michael > --- > Changelog: > - select TCL also depends on RUNTIME > - simplify 'or' in makefile's ifdef > - targetinstall file from pkgdir, not srcdir > (all above pointed by Michael Olbrich, thanks!) > > rules/usb-modeswitch.in | 20 +++++++++++++++++--- > rules/usb-modeswitch.make | 24 ++++++++++++++++++++++++ > 2 files changed, 41 insertions(+), 3 deletions(-) > > diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in > index aaefd86..3ccf31f 100644 > --- a/rules/usb-modeswitch.in > +++ b/rules/usb-modeswitch.in > @@ -1,11 +1,25 @@ > ## SECTION=shell_and_console > > -config USB_MODESWITCH > - tristate > - prompt "usb-modeswitch" > +menuconfig USB_MODESWITCH > + tristate "usb-modeswitch " > select LIBUSB > + select TCL if (USB_MODESWITCH_UDEV_HELPER || USB_MODESWITCH_SYSTEMD_UNIT) && RUNTIME > help > USB_ModeSwitch is (surprise!) a mode switching tool > for controlling 'multi-mode' USB devices. > > +if USB_MODESWITCH > + > +config USB_MODESWITCH_UDEV_HELPER > + bool "install udev helper" > + default y > + depends on UDEV > + > +config USB_MODESWITCH_SYSTEMD_UNIT > + bool "install systemd unit file" > + default y > + depends on SYSTEMD > + > +endif > + > # vim: set sw=8 ts=8 noet ft=kconfig: > diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make > index 4ebf0e8..95149a3 100644 > --- a/rules/usb-modeswitch.make > +++ b/rules/usb-modeswitch.make > @@ -37,6 +37,18 @@ USB_MODESWITCH_MAKE_ENV := $(CROSS_ENV) > USB_MODESWITCH_MAKE_OPT := $(CROSS_ENV_PROGS) > > # ---------------------------------------------------------------------------- > +# Install > +# ---------------------------------------------------------------------------- > + > +$(STATEDIR)/usb-modeswitch.install: > + @$(call targetinfo) > + @$(call world/install, USB_MODESWITCH) > + @mkdir -p $(USB_MODESWITCH_PKGDIR)/lib/systemd/system > + @install -m 0644 $(USB_MODESWITCH_DIR)/usb_modeswitch@.service \ > + $(USB_MODESWITCH_PKGDIR)/lib/systemd/system/usb_modeswitch@.service > + @$(call touch) > + > +# ---------------------------------------------------------------------------- > # Target-Install > # ---------------------------------------------------------------------------- > > @@ -51,6 +63,18 @@ $(STATEDIR)/usb-modeswitch.targetinstall: > > @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ > /usr/sbin/usb_modeswitch) > +ifneq ($(PTXCONF_USB_MODESWITCH_UDEV_HELPER)$(PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT),) > + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ > + /usr/sbin/usb_modeswitch_dispatcher) > +endif > +ifdef PTXCONF_USB_MODESWITCH_UDEV_HELPER > + @$(call install_copy, usb-modeswitch, 0, 0, 0755, -, \ > + /lib/udev/usb_modeswitch) > +endif > +ifdef PTXCONF_USB_MODESWITCH_SYSTEMD_UNIT > + @$(call install_copy, usb-modeswitch, 0, 0, 0644, -, \ > + /lib/systemd/system/usb_modeswitch@.service) > +endif > > @$(call install_finish, usb-modeswitch) > > -- > 2.1.4 > > > _______________________________________________ > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 2016-01-22 0:24 [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 Ladislav Michl 2016-01-22 13:38 ` [ptxdist] [PATCH] usb_modeswitch: udev helper Ladislav Michl @ 2016-02-11 11:24 ` Michael Olbrich 1 sibling, 0 replies; 6+ messages in thread From: Michael Olbrich @ 2016-02-11 11:24 UTC (permalink / raw) To: ptxdist On Fri, Jan 22, 2016 at 01:24:27AM +0100, Ladislav Michl wrote: > Also update help to match official description. > > Signed-off-by: Ladislav Michl <ladis@linux-mips.org> Thanks, applied. Michael > --- > rules/usb-modeswitch.in | 3 ++- > rules/usb-modeswitch.make | 4 ++-- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/rules/usb-modeswitch.in b/rules/usb-modeswitch.in > index 555d8a7..aaefd86 100644 > --- a/rules/usb-modeswitch.in > +++ b/rules/usb-modeswitch.in > @@ -5,6 +5,7 @@ config USB_MODESWITCH > prompt "usb-modeswitch" > select LIBUSB > help > - Activating switchable USB devices on Linux. > + USB_ModeSwitch is (surprise!) a mode switching tool > + for controlling 'multi-mode' USB devices. > > # vim: set sw=8 ts=8 noet ft=kconfig: > diff --git a/rules/usb-modeswitch.make b/rules/usb-modeswitch.make > index d6a0a82..4ebf0e8 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.2.1 > -USB_MODESWITCH_MD5 := 46cd7fa937655ab2df616c1d5dfb121e > +USB_MODESWITCH_VERSION := 2.3.0 > +USB_MODESWITCH_MD5 := 7faf7dccd50b3ca8aaa16fcb5bf0dc2f > 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) > -- > 2.1.4 > > > _______________________________________________ > 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-11 11:25 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-01-22 0:24 [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 Ladislav Michl 2016-01-22 13:38 ` [ptxdist] [PATCH] usb_modeswitch: udev helper Ladislav Michl 2016-01-22 15:10 ` Michael Olbrich 2016-01-22 16:27 ` [ptxdist] [PATCH v2] " Ladislav Michl 2016-02-11 11:25 ` Michael Olbrich 2016-02-11 11:24 ` [ptxdist] [PATCH] usb_modeswitch: version bump 2.2.1 -> 2.3.0 Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox