From 227e86a6b29f31734834717096c3e13a272dccf8 Mon Sep 17 00:00:00 2001 From: Michael 'Mickey' Lauer Date: Mon, 2 Mar 2009 23:38:31 +0100 Subject: blueprobe 0.18: fix makefile so that it actually builds remove older ones --- packages/blueprobe/blueprobe-0.15/h6300.patch | 17 ------------ packages/blueprobe/blueprobe-0.15/hx4700.patch | 26 ------------------- packages/blueprobe/blueprobe-0.16/h6300.patch | 17 ------------ packages/blueprobe/blueprobe-0.16/hx4700.patch | 30 ---------------------- .../blueprobe/blueprobe-0.17/h2200-fixup.patch | 11 -------- .../blueprobe/blueprobe-0.17/htcuniversal.patch | 18 ------------- packages/blueprobe/blueprobe-0.17/hwuart.patch | 21 --------------- packages/blueprobe/blueprobe-0.17/hx4700.patch | 22 ---------------- .../blueprobe/blueprobe-0.18/fix-makefile.patch | 13 ++++++++++ packages/blueprobe/blueprobe.inc | 3 ++- packages/blueprobe/blueprobe_0.13.bb | 1 - packages/blueprobe/blueprobe_0.14.bb | 1 - packages/blueprobe/blueprobe_0.15.bb | 6 ----- packages/blueprobe/blueprobe_0.16.bb | 6 ----- packages/blueprobe/blueprobe_0.17.bb | 8 ------ packages/blueprobe/blueprobe_0.18.bb | 12 +++++---- 16 files changed, 22 insertions(+), 190 deletions(-) delete mode 100644 packages/blueprobe/blueprobe-0.15/h6300.patch delete mode 100644 packages/blueprobe/blueprobe-0.15/hx4700.patch delete mode 100644 packages/blueprobe/blueprobe-0.16/h6300.patch delete mode 100644 packages/blueprobe/blueprobe-0.16/hx4700.patch delete mode 100644 packages/blueprobe/blueprobe-0.17/h2200-fixup.patch delete mode 100644 packages/blueprobe/blueprobe-0.17/htcuniversal.patch delete mode 100644 packages/blueprobe/blueprobe-0.17/hwuart.patch delete mode 100644 packages/blueprobe/blueprobe-0.17/hx4700.patch create mode 100644 packages/blueprobe/blueprobe-0.18/fix-makefile.patch delete mode 100644 packages/blueprobe/blueprobe_0.13.bb delete mode 100644 packages/blueprobe/blueprobe_0.14.bb delete mode 100644 packages/blueprobe/blueprobe_0.15.bb delete mode 100644 packages/blueprobe/blueprobe_0.16.bb delete mode 100644 packages/blueprobe/blueprobe_0.17.bb (limited to 'packages') diff --git a/packages/blueprobe/blueprobe-0.15/h6300.patch b/packages/blueprobe/blueprobe-0.15/h6300.patch deleted file mode 100644 index 39de7758b0..0000000000 --- a/packages/blueprobe/blueprobe-0.15/h6300.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur blueprobe-0.15_orig/blueprobe.init blueprobe-0.15_h6300_fix/blueprobe.init ---- blueprobe-0.15_orig/blueprobe.init 2005-10-05 22:37:35.706302041 +0300 -+++ blueprobe-0.15_h6300_fix/blueprobe.init 2005-10-05 22:54:51.840676832 +0300 -@@ -57,6 +57,13 @@ - SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts - PROBE=no - ;; -+ "HP iPAQ H6300") -+ BLUETOOTH=yes -+ PORT=/dev/ttyS0 -+ SPEED=115200 -+ PROTO=texas -+ PROBE=no -+ ;; - *) - BLUETOOTH=no - ;; diff --git a/packages/blueprobe/blueprobe-0.15/hx4700.patch b/packages/blueprobe/blueprobe-0.15/hx4700.patch deleted file mode 100644 index 692f33f662..0000000000 --- a/packages/blueprobe/blueprobe-0.15/hx4700.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- blueprobe-0.14/blueprobe.init.orig 2005-09-05 22:03:57 +0200 -+++ blueprobe-0.14/blueprobe.init 2005-09-05 22:09:34 +0200 -@@ -47,6 +47,14 @@ - PROTO=bcsp - PROBE=yes - ;; -+ "HP iPAQ HX4700") -+ BLUETOOTH=yes -+ PORT=/dev/ttyS1 -+ SPEED=921600 -+ PROTO=texas -+ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts -+ PROBE=no -+ ;; - *) - BLUETOOTH=no - ;; -@@ -67,5 +75,8 @@ - echo "BLUETOOTH_PORT=$PORT" >>/etc/sysconfig/bluetooth - echo "BLUETOOTH_SPEED=$SPEED" >>/etc/sysconfig/bluetooth - echo "BLUETOOTH_PROTOCOL=$PROTO" >>/etc/sysconfig/bluetooth -+ if [ "$SCRIPT" != "" ] && [ -f "$SCRIPT" ]; then -+ echo "BLUETOOTH_SCRIPT=$SCRIPT" >>/etc/sysconfig/bluetooth -+ fi - fi - fi diff --git a/packages/blueprobe/blueprobe-0.16/h6300.patch b/packages/blueprobe/blueprobe-0.16/h6300.patch deleted file mode 100644 index 39de7758b0..0000000000 --- a/packages/blueprobe/blueprobe-0.16/h6300.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -Naur blueprobe-0.15_orig/blueprobe.init blueprobe-0.15_h6300_fix/blueprobe.init ---- blueprobe-0.15_orig/blueprobe.init 2005-10-05 22:37:35.706302041 +0300 -+++ blueprobe-0.15_h6300_fix/blueprobe.init 2005-10-05 22:54:51.840676832 +0300 -@@ -57,6 +57,13 @@ - SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts - PROBE=no - ;; -+ "HP iPAQ H6300") -+ BLUETOOTH=yes -+ PORT=/dev/ttyS0 -+ SPEED=115200 -+ PROTO=texas -+ PROBE=no -+ ;; - *) - BLUETOOTH=no - ;; diff --git a/packages/blueprobe/blueprobe-0.16/hx4700.patch b/packages/blueprobe/blueprobe-0.16/hx4700.patch deleted file mode 100644 index 69610e8c7b..0000000000 --- a/packages/blueprobe/blueprobe-0.16/hx4700.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- blueprobe-0.14/blueprobe.init.orig 2005-09-05 22:03:57 +0200 -+++ blueprobe-0.14/blueprobe.init 2005-09-05 22:09:34 +0200 -@@ -47,6 +47,18 @@ - PROTO=bcsp - PROBE=yes - ;; -+ "HP iPAQ HX4700") -+ BLUETOOTH=yes -+ PORT=/dev/ttyS1 -+ PROTO=texas -+ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts -+ if [ -f "$SCRIPT" ]; then -+ SPEED=921600 -+ else -+ SPEED=115200 -+ fi -+ PROBE=no -+ ;; - *) - BLUETOOTH=no - ;; -@@ -67,5 +75,8 @@ - echo "BLUETOOTH_PORT=$PORT" >>/etc/sysconfig/bluetooth - echo "BLUETOOTH_SPEED=$SPEED" >>/etc/sysconfig/bluetooth - echo "BLUETOOTH_PROTOCOL=$PROTO" >>/etc/sysconfig/bluetooth -+ if [ "$SCRIPT" != "" ] && [ -f "$SCRIPT" ]; then -+ echo "BLUETOOTH_SCRIPT=$SCRIPT" >>/etc/sysconfig/bluetooth -+ fi - fi - fi diff --git a/packages/blueprobe/blueprobe-0.17/h2200-fixup.patch b/packages/blueprobe/blueprobe-0.17/h2200-fixup.patch deleted file mode 100644 index 965bbf405e..0000000000 --- a/packages/blueprobe/blueprobe-0.17/h2200-fixup.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/blueprobe.init 2006-05-10 18:38:42.581557352 +0200 -+++ blueprobe-0.17/blueprobe.init 2006-05-10 18:38:54.001821208 +0200 -@@ -28,7 +28,7 @@ - case `module_id` in - "HP iPAQ H2200") - BLUETOOTH=yes -- PORT=/dev/tts/3 -+ PORT=/dev/ttyS3 - SPEED=921600 - PROBE=no - RADIO_VER=`h2200_radio_version` diff --git a/packages/blueprobe/blueprobe-0.17/htcuniversal.patch b/packages/blueprobe/blueprobe-0.17/htcuniversal.patch deleted file mode 100644 index f84a36bbec..0000000000 --- a/packages/blueprobe/blueprobe-0.17/htcuniversal.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- blueprobe-0.17/blueprobe.init.orig 2006-01-21 19:47:56.000000000 +0100 -+++ blueprobe-0.17/blueprobe.init 2006-06-15 00:40:57.000000000 +0200 -@@ -74,6 +74,15 @@ - PROTO=texas - PROBE=no - ;; -+ "HTC Universal") -+ BLUETOOTH=yes -+ PORT=/dev/ttyS1 -+ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts -+ SPEED='`[ -f "$BLUETOOTH_SCRIPT" ] && echo 921600 || echo 115200`' -+ PROTO=texas -+ PROBE=no -+ ;; -+ - *) - BLUETOOTH=no - ;; diff --git a/packages/blueprobe/blueprobe-0.17/hwuart.patch b/packages/blueprobe/blueprobe-0.17/hwuart.patch deleted file mode 100644 index 274c1455d8..0000000000 --- a/packages/blueprobe/blueprobe-0.17/hwuart.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: base/blueprobe/blueprobe.init -=================================================================== ---- base/blueprobe/blueprobe.init (revision 8939) -+++ base/blueprobe/blueprobe.init (working copy) -@@ -46,14 +46,14 @@ - ;; - "HP iPAQ H5400") - BLUETOOTH=yes -- PORT=/dev/tts/1 -+ PORT=/dev/ttyS3 - SPEED=921600 - PROTO=any - PROBE=yes - ;; - "HP iPAQ H3900") - BLUETOOTH=yes -- PORT=/dev/tts/1 -+ PORT=/dev/ttyS1 - SPEED=921600 - PROTO=bcsp - PROBE=yes diff --git a/packages/blueprobe/blueprobe-0.17/hx4700.patch b/packages/blueprobe/blueprobe-0.17/hx4700.patch deleted file mode 100644 index f1ee19e9d5..0000000000 --- a/packages/blueprobe/blueprobe-0.17/hx4700.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- blueprobe-0.17/blueprobe.init.orig 2006-01-22 13:19:14.000000000 +0100 -+++ blueprobe-0.17/blueprobe.init 2006-01-22 13:23:21.000000000 +0100 -@@ -70,7 +70,8 @@ - "HP iPAQ HX4700") - BLUETOOTH=yes - PORT=/dev/ttyS1 -- SPEED=115200 -+ SCRIPT=/etc/bluetooth/TIInit_3.2.26.bts -+ SPEED='`[ -f "$BLUETOOTH_SCRIPT" ] && echo 921600 || echo 115200`' - PROTO=texas - PROBE=no - ;; -@@ -99,6 +100,9 @@ - echo "BLUETOOTH=$BLUETOOTH" >/etc/sysconfig/bluetooth - if [ $BLUETOOTH = "yes" ]; then - echo "BLUETOOTH_PORT=$PORT" >>/etc/sysconfig/bluetooth -+ if [ "$SCRIPT" != "" ]; then -+ echo "BLUETOOTH_SCRIPT=$SCRIPT" >>/etc/sysconfig/bluetooth -+ fi - echo "BLUETOOTH_SPEED=$SPEED" >>/etc/sysconfig/bluetooth - echo "BLUETOOTH_PROTOCOL=$PROTO" >>/etc/sysconfig/bluetooth - fi diff --git a/packages/blueprobe/blueprobe-0.18/fix-makefile.patch b/packages/blueprobe/blueprobe-0.18/fix-makefile.patch new file mode 100644 index 0000000000..f1bad8b707 --- /dev/null +++ b/packages/blueprobe/blueprobe-0.18/fix-makefile.patch @@ -0,0 +1,13 @@ +Index: blueprobe-0.18/Makefile +=================================================================== +--- blueprobe-0.18.orig/Makefile ++++ blueprobe-0.18/Makefile +@@ -28,7 +28,7 @@ + install-program: $(PACKAGE) + install -d $(DESTDIR)/etc/sysconfig + install -d $(DESTDIR)$(PREFIX)/bin +- install -s $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) ++ install $(PACKAGE) $(DESTDIR)$(PREFIX)/bin/$(PACKAGE) + install -d $(DESTDIR)/etc/init.d + install $(PACKAGE).init $(DESTDIR)/etc/init.d/$(PACKAGE) + install -d $(DESTDIR)/etc/rcS.d diff --git a/packages/blueprobe/blueprobe.inc b/packages/blueprobe/blueprobe.inc index 894a3ebe7e..4b31a2836e 100644 --- a/packages/blueprobe/blueprobe.inc +++ b/packages/blueprobe/blueprobe.inc @@ -1,4 +1,5 @@ +DESCRIPTION = "Discovers machine-specific Bluetooth parameters" SECTION = "base" LICENSE = "GPL" -DESCRIPTION = "Discovers machine-specific Bluetooth parameters" + inherit gpe diff --git a/packages/blueprobe/blueprobe_0.13.bb b/packages/blueprobe/blueprobe_0.13.bb deleted file mode 100644 index 50ea03e854..0000000000 --- a/packages/blueprobe/blueprobe_0.13.bb +++ /dev/null @@ -1 +0,0 @@ -require blueprobe.inc diff --git a/packages/blueprobe/blueprobe_0.14.bb b/packages/blueprobe/blueprobe_0.14.bb deleted file mode 100644 index 50ea03e854..0000000000 --- a/packages/blueprobe/blueprobe_0.14.bb +++ /dev/null @@ -1 +0,0 @@ -require blueprobe.inc diff --git a/packages/blueprobe/blueprobe_0.15.bb b/packages/blueprobe/blueprobe_0.15.bb deleted file mode 100644 index e39407cc16..0000000000 --- a/packages/blueprobe/blueprobe_0.15.bb +++ /dev/null @@ -1,6 +0,0 @@ -require blueprobe.inc - -PR = "r2" - -SRC_URI += "file://hx4700.patch;patch=1 \ - file://h6300.patch;patch=1" diff --git a/packages/blueprobe/blueprobe_0.16.bb b/packages/blueprobe/blueprobe_0.16.bb deleted file mode 100644 index db190332e7..0000000000 --- a/packages/blueprobe/blueprobe_0.16.bb +++ /dev/null @@ -1,6 +0,0 @@ -require blueprobe.inc - -PR = "r1" - -SRC_URI += "file://hx4700.patch;patch=1 \ - file://h6300.patch;patch=1" diff --git a/packages/blueprobe/blueprobe_0.17.bb b/packages/blueprobe/blueprobe_0.17.bb deleted file mode 100644 index b82bedf632..0000000000 --- a/packages/blueprobe/blueprobe_0.17.bb +++ /dev/null @@ -1,8 +0,0 @@ -require blueprobe.inc - -PR = "r3" - -SRC_URI += "file://hx4700.patch;patch=1 \ - file://h2200-fixup.patch;patch=1 \ - file://htcuniversal.patch;patch=1 \ - file://hwuart.patch;patch=1;pnum=2" diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb index d0405745ba..7ad62d8db8 100644 --- a/packages/blueprobe/blueprobe_0.18.bb +++ b/packages/blueprobe/blueprobe_0.18.bb @@ -1,7 +1,9 @@ require blueprobe.inc +PR = "r6" -PR = "r5" - -SRC_URI += "file://h4000.patch;patch=1 \ - file://uclibc-fix.patch;patch=1 \ - file://rx3000.patch;patch=1" +SRC_URI += "\ + file://fix-makefile.patch;patch=1 \ + file://h4000.patch;patch=1 \ + file://uclibc-fix.patch;patch=1 \ + file://rx3000.patch;patch=1 \ +" -- cgit v1.2.3