usb-modeswitch: update to 1.2.2

This is still using the tcl version of the dispatcher, the non-tcl version doesn't crosscompile :(

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi 2012-01-28 09:30:48 +01:00
parent 2ae5b3ed7e
commit 245be9e381
3 changed files with 80 additions and 4 deletions

View File

@ -0,0 +1,29 @@
From 4d3fb03d89f685e1fe1d4b544bcb1be04cbade6f Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 28 Jan 2012 10:16:24 +0100
Subject: [PATCH] usbmodeswitch: leave stripping to packager
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
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 @@ distclean:
cd jim && $(MAKE) distclean
install-common:
- 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

View File

@ -0,0 +1,45 @@
From 86f80442a3fb2b7f9bd1d4ba339fff967c04c3a7 Mon Sep 17 00:00:00 2001
From: Koen Kooi <koen@dominion.thruhere.net>
Date: Sat, 28 Jan 2012 12:17:47 +0100
Subject: [PATCH] usb-modeswitch: leave script munging to recipe
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
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,23 +51,12 @@ install-common:
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.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-shared: shared install-common install-binary
--
1.7.2.5

View File

@ -5,14 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
DEPENDS = "virtual/libusb0"
SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${PV}.tar.bz2 \
"
SRC_URI[md5sum] = "76f6978f18cac41f269a346a5d0f1052"
SRC_URI[sha256sum] = "cb9794135e28e0a7984aab8e7bcc8c3f8a8f4aa9d2f024fa81b0b2a926fc0219"
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"
do_install() {
sed -i 's: -s : :g' Makefile
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}"
RDEPENDS_${PN} = "tcl"
RRECOMMENDS_${PN} = "usb-modeswitch-data"