From 371722efd49b0d806f9fe012310b4c4e63aae05f Mon Sep 17 00:00:00 2001 From: Yevhen Kyriukha Date: Tue, 24 Sep 2013 23:47:20 +0000 Subject: [PATCH] usb-modeswitch: upgrade to upstream version. Upgrade usb-modeswitch to v2.0.1. Upgrade usb-modeswitch-data to v20130807. Two patches were removed because changes that they provide are already exist. (From meta-openembedded rev: af2c5fee94173d1d6b45e6535318f39632c5c2ed) Signed-off-by: Yevhen Kyriukha Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- ...20121109.bb => usb-modeswitch-data_20130807.bb} | 4 +-- ...usbmodeswitch-leave-stripping-to-packager.patch | 26 --------------- ...modeswitch-leave-script-munging-to-recipe.patch | 39 ---------------------- .../usb-modeswitch/usb-modeswitch_1.2.5.bb | 20 ----------- .../usb-modeswitch/usb-modeswitch_2.0.1.bb | 17 ++++++++++ 5 files changed, 19 insertions(+), 87 deletions(-) rename meta-openembedded/meta-oe/recipes-support/usb-modeswitch/{usb-modeswitch-data_20121109.bb => usb-modeswitch-data_20130807.bb} (74%) delete mode 100644 meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb similarity index 74% rename from meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb rename to meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb index de81812..fc0fbfb 100644 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" inherit allarch SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2" -SRC_URI[md5sum] = "a7d23a03157871013a0d708ab2b1b6df" -SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5" +SRC_URI[md5sum] = "91feff51deba6e48e78506b8f4db2274" +SRC_URI[sha256sum] = "a3114e2c1f38eed3ad0067df30e53a96313908a9539a8ea5d94a4d35651699eb" do_install() { oe_runmake install DESTDIR=${D} diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch deleted file mode 100644 index e51a89c..0000000 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4d3fb03d89f685e1fe1d4b544bcb1be04cbade6f Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Sat, 28 Jan 2012 10:16:24 +0100 -Subject: [PATCH] usbmodeswitch: leave stripping to packager - -Signed-off-by: Koen Kooi ---- - -Upstream-Status: Unknown - - Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index 2072976..a71780a 100644 ---- a/Makefile -+++ b/Makefile -@@ -46,7 +46,7 @@ - cd jim && $(MAKE) distclean - - install-common: all -- 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 diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch deleted file mode 100644 index 4f549fd..0000000 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 86f80442a3fb2b7f9bd1d4ba339fff967c04c3a7 Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Sat, 28 Jan 2012 12:17:47 +0100 -Subject: [PATCH] usb-modeswitch: leave script munging to recipe - -Signed-off-by: Koen Kooi ---- - -Upstream-Status: Unknown - - Makefile | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -diff --git a/Makefile b/Makefile -index a71780a..a26b8de 100644 ---- a/Makefile -+++ b/Makefile -@@ -51,20 +51,9 @@ - install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf - install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1 - install -d $(DESTDIR)/var/lib/usb_modeswitch -- --install-script: -- @SHELL=`which tclsh 2>/dev/null`; \ -- if [ -z $$SHELL ]; then \ -- SHELL="`which jimsh 2>/dev/null`"; \ -- if [ -z $$SHELL ]; then \ -- echo "Warning: no Tcl interpreter found!"; \ -- SHELL="/usr/bin/tclsh"; \ -- fi \ -- fi ; \ -- sed 's_!/usr/bin/tclsh_!'"$$SHELL"'_' usb_modeswitch_dispatcher - install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher - --install: install-common install-script -+install: install-common - - install-shared: dispatcher-dynamic install-common - install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb deleted file mode 100644 index fe6ea62..0000000 --- a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "virtual/libusb0" - -SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2 \ - file://0001-usbmodeswitch-leave-stripping-to-packager.patch \ - file://0002-usb-modeswitch-leave-script-munging-to-recipe.patch" -SRC_URI[md5sum] = "c393603908eceab95444c5bde790f6f0" -SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f" - -do_install() { - sed 's_!/usr/bin_!'"${bindir}"'_' usb_modeswitch_dispatcher - oe_runmake install DESTDIR=${D} -} - -FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" -RDEPENDS_${PN} = "tcl" -RRECOMMENDS_${PN} = "usb-modeswitch-data" diff --git a/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb new file mode 100644 index 0000000..3485523 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +inherit autotools + +DEPENDS = "libusb1" + +SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2" +SRC_URI[md5sum] = "e48d4419d0574d342bb183f7465556d0" +SRC_URI[sha256sum] = "4706c9cfe825263e189f55730ea3d1d8634aeb15645a1098532e946e770f7f95" + +EXTRA_OEMAKE = "TCL=${bindir}/tclsh" + +FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch" +RDEPENDS_${PN} = "tcl" +RRECOMMENDS_${PN} = "usb-modeswitch-data" -- 2.7.4