aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/usb-modeswitch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-12-02 03:14:44 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2012-12-11 01:52:49 +0100
commitab63bbe815d64ddf734af784e70879580fcb2b09 (patch)
tree6ff05e5035e6075612b84fdfb28b3508ed81d116 /meta-oe/recipes-support/usb-modeswitch
parenta3baae9859d7499ecdefd63b17e4b655713a515d (diff)
downloadmeta-openembedded-contrib-ab63bbe815d64ddf734af784e70879580fcb2b09.tar.gz
meta-openembedded-contrib-ab63bbe815d64ddf734af784e70879580fcb2b09.tar.bz2
meta-openembedded-contrib-ab63bbe815d64ddf734af784e70879580fcb2b09.zip
usb-modeswitch: upgrade to 1.2.5
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/0001-usbmodeswitch-leave-stripping-to-packager.patch7
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0002-usb-modeswitch-leave-script-munging-to-recipe.patch16
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb (renamed from meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.2.bb)6
3 files changed, 10 insertions, 19 deletions
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
index 063aba503f..0cbacf011a 100644
--- 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
@@ -15,15 +15,12 @@ diff --git a/Makefile b/Makefile
index 2072976..a71780a 100644
--- a/Makefile
+++ b/Makefile
-@@ -46,7 +46,7 @@ distclean:
+@@ -46,7 +46,7 @@
cd jim && $(MAKE) distclean
- install-common:
+ 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
---
-1.7.2.5
-
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
index d6f2ff29b5..f9396b28c3 100644
--- 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
@@ -15,7 +15,7 @@ diff --git a/Makefile b/Makefile
index a71780a..a26b8de 100644
--- a/Makefile
+++ b/Makefile
-@@ -51,23 +51,12 @@ install-common:
+@@ -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
@@ -32,14 +32,8 @@ index a71780a..a26b8de 100644
- sed 's_!/usr/bin/tclsh_!'"$$SHELL"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
- install-binary:
- install -D --mode=755 usb_modeswitch_dispatcher $(SBINDIR)/usb_modeswitch_dispatcher
-
--install: all install-common install-script
-+install: all install-common
+-install: install-common install-script
++install: install-common
- install-shared: shared install-common install-binary
-
---
-1.7.2.5
-
+ install-shared: dispatcher-dynamic install-common
+ 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.2.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
index 2e19370bba..b0c9e951d7 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.2.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_1.2.5.bb
@@ -7,14 +7,14 @@ 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] = "4f3d3b9342b59b488089a8a81abda3ae"
-SRC_URI[sha256sum] = "b46b08b0899bbacfe9081ed907f8d0f3fac9e647c4d0f3705c85804cb3a431e0"
+SRC_URI[md5sum] = "c393603908eceab95444c5bde790f6f0"
+SRC_URI[sha256sum] = "ce47a3dec3e4c93e0a2fcea64278d0e289e6e78d8e1381c54f03986e443ab90f"
do_install() {
sed 's_!/usr/bin_!'"${bindir}"'_' <usb_modeswitch.tcl >usb_modeswitch_dispatcher
oe_runmake install DESTDIR=${D}
}
-FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir}"
+FILES_${PN} = "${bindir} ${sysconfdir} ${base_libdir}/udev/usb_modeswitch ${sbindir} ${localstatedir}/lib/usb_modeswitch"
RDEPENDS_${PN} = "tcl"
RRECOMMENDS_${PN} = "usb-modeswitch-data"