summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/usb-modeswitch
diff options
context:
space:
mode:
authorYevhen Kyriukha <kirgene@gmail.com>2013-09-24 23:47:20 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-05 12:36:24 +0200
commitaf2c5fee94173d1d6b45e6535318f39632c5c2ed (patch)
treec441ed4b13402856e422e81abfb0ea933bc54310 /meta-oe/recipes-support/usb-modeswitch
parent595bcead12aa34e48c22f7297aa06f2c0643c04e (diff)
downloadmeta-openembedded-af2c5fee94173d1d6b45e6535318f39632c5c2ed.tar.gz
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. Signed-off-by: Yevhen Kyriukha <kirgene@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/usb-modeswitch')
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb (renamed from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb)4
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch26
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch39
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb20
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb17
5 files changed, 19 insertions, 87 deletions
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
index de8181245..fc0fbfb9d 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20121109.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20130807.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
5inherit allarch 5inherit allarch
6 6
7SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2" 7SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${PV}.tar.bz2"
8SRC_URI[md5sum] = "a7d23a03157871013a0d708ab2b1b6df" 8SRC_URI[md5sum] = "91feff51deba6e48e78506b8f4db2274"
9SRC_URI[sha256sum] = "a74346a471d540ba9da7d7b332ad35ea05ff7375297c0da87da5be675293d5a5" 9SRC_URI[sha256sum] = "a3114e2c1f38eed3ad0067df30e53a96313908a9539a8ea5d94a4d35651699eb"
10 10
11do_install() { 11do_install() {
12 oe_runmake install DESTDIR=${D} 12 oe_runmake install DESTDIR=${D}
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch
deleted file mode 100644
index e51a89cae..000000000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-usbmodeswitch-leave-stripping-to-packager.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 4d3fb03d89f685e1fe1d4b544bcb1be04cbade6f Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 28 Jan 2012 10:16:24 +0100
4Subject: [PATCH] usbmodeswitch: leave stripping to packager
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8
9Upstream-Status: Unknown
10
11 Makefile | 2 +-
12 1 files changed, 1 insertions(+), 1 deletions(-)
13
14diff --git a/Makefile b/Makefile
15index 2072976..a71780a 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -46,7 +46,7 @@
19 cd jim && $(MAKE) distclean
20
21 install-common: all
22- install -D -s --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
23+ install -D --mode=755 usb_modeswitch $(SBINDIR)/usb_modeswitch
24 install -D --mode=755 usb_modeswitch.sh $(UDEVDIR)/usb_modeswitch
25 install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
26 install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch
deleted file mode 100644
index 4f549fd97..000000000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 86f80442a3fb2b7f9bd1d4ba339fff967c04c3a7 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Sat, 28 Jan 2012 12:17:47 +0100
4Subject: [PATCH] usb-modeswitch: leave script munging to recipe
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8
9Upstream-Status: Unknown
10
11 Makefile | 13 +------------
12 1 files changed, 1 insertions(+), 12 deletions(-)
13
14diff --git a/Makefile b/Makefile
15index a71780a..a26b8de 100644
16--- a/Makefile
17+++ b/Makefile
18@@ -51,20 +51,9 @@
19 install -D --mode=644 usb_modeswitch.conf $(ETCDIR)/usb_modeswitch.conf
20 install -D --mode=644 usb_modeswitch.1 $(MANDIR)/usb_modeswitch.1
21 install -d $(DESTDIR)/var/lib/usb_modeswitch
22-
23-install-script:
24- @SHELL=`which tclsh 2>/dev/null`; \
25- if [ -z $$SHELL ]; then \
26- SHELL="`which jimsh 2>/dev/null`"; \
27- if [ -z $$SHELL ]; then \
28- echo "Warning: no Tcl interpreter found!"; \
29- SHELL="/usr/bin/tclsh"; \
30- fi \
31- fi ; \
32- sed 's_!/usr/bin/tclsh_!'"$$SHELL"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
33 install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
34
35-install: install-common install-script
36+install: install-common
37
38 install-shared: dispatcher-dynamic install-common
39 install -D -s --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
deleted file mode 100644
index fe6ea6290..000000000
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
+++ /dev/null
@@ -1,20 +0,0 @@
1DESCRIPTION = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4
5DEPENDS = "virtual/libusb0"
6
7SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2 \
8 file://0001-usbmodeswitch-leave-stripping-to-packager.patch \
9 file://0002-usb-modeswitch-leave-script-munging-to-recipe.patch"
10SRC_URI[md5sum] = "c393603908eceab95444c5bde790f6f0"
11SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f"
12
13do_install() {
14 sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
15 oe_runmake install DESTDIR=${D}
16}
17
18FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
19RDEPENDS_${PN} = "tcl"
20RRECOMMENDS_${PN} = "usb-modeswitch-data"
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
new file mode 100644
index 000000000..34855234b
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.0.1.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4
5inherit autotools
6
7DEPENDS = "libusb1"
8
9SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2"
10SRC_URI[md5sum] = "e48d4419d0574d342bb183f7465556d0"
11SRC_URI[sha256sum] = "4706c9cfe825263e189f55730ea3d1d8634aeb15645a1098532e946e770f7f95"
12
13EXTRA_OEMAKE = "TCL=${bindir}/tclsh"
14
15FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
16RDEPENDS_${PN} = "tcl"
17RRECOMMENDS_${PN} = "usb-modeswitch-data"