summaryrefslogtreecommitdiff
path: root/packages/bluez-utils
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2004-12-31 18:27:12 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2004-12-31 18:27:12 +0000
commitb53bf6999ed1feedd9d79f1c99b63ddc811b39af (patch)
tree1f01fbd18e3699902365f6f333d4dc4f41a16290 /packages/bluez-utils
parentd2be6ff7d469ff740f68f544240e96b8e2960b5a (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2004/12/31 10:27:11-08:00 (none)!ggilbert These fonts appear to be derived from the MS Core fonts which do not allow modification or distribution outside of the exe's MS released .del-qpf-verdana_1.0.bb~625cb40657a05a6f: Delete: packages/qpf-fonts/qpf-verdana_1.0.bb .del-qpf-georgia_1.0.bb~ef9e3d0fabb2ec85: Delete: packages/qpf-fonts/qpf-georgia_1.0.bb 2004/12/31 12:27:22-05:00 handhelds.org!kergoth Merge oe-devel@oe-devel.bkbits.net:openembedded into handhelds.org:/home/kergoth/code/openembedded 2004/12/31 12:27:07-05:00 handhelds.org!kergoth Add unionfs 1.0.4. 2004/12/31 17:09:41+00:00 nexus.co.uk!pb change $HOME for root to /home/root in passwd.master 2004/12/31 16:56:52+00:00 nexus.co.uk!pb blow away some outdated handhelds-pxa kernels 2004/12/31 16:55:28+00:00 nexus.co.uk!pb remove spurious PACKAGE_ARCH 2004/12/31 16:48:07+00:00 nexus.co.uk!pb curtail stack smashing when receiving a dbus error 2004/12/31 16:44:26+00:00 nexus.co.uk!pb add copyright header to update-rc.d script BKrev: 41d59a00a2p6CzivhRXSNm80dLBliA
Diffstat (limited to 'packages/bluez-utils')
-rw-r--r--packages/bluez-utils/bluez-utils-dbus-2.11/smash.patch0
-rw-r--r--packages/bluez-utils/bluez-utils-dbus_2.11.bb4
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/bluez-utils/bluez-utils-dbus-2.11/smash.patch b/packages/bluez-utils/bluez-utils-dbus-2.11/smash.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez-utils/bluez-utils-dbus-2.11/smash.patch
diff --git a/packages/bluez-utils/bluez-utils-dbus_2.11.bb b/packages/bluez-utils/bluez-utils-dbus_2.11.bb
index 4189e80988..fd2f222f30 100644
--- a/packages/bluez-utils/bluez-utils-dbus_2.11.bb
+++ b/packages/bluez-utils/bluez-utils-dbus_2.11.bb
@@ -1,6 +1,6 @@
include bluez-utils-common_${PV}.inc
DEPENDS += "dbus"
-SRC_URI += "file://dbus.patch;patch=1"
-PR = "r3"
+SRC_URI += "file://dbus.patch;patch=1 file://smash.patch;patch=1"
+PR = "r4"
EXTRA_OECONF += "--with-dbus"