diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-01-28 00:12:34 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-01-28 00:12:34 +0000 |
| commit | 3e3426a943c22b95ca15c1c9b72c47502ecc4e28 (patch) | |
| tree | 48f0b6937ff6063eecc345fdb4c54e621b410d69 | |
| parent | b91082455470d09ff8302e07ccac9920c8a2a924 (diff) | |
| parent | c291df04a3913d8559159f82c3b0ffa4dae7de33 (diff) | |
merge of '2b629c70f36efd84d9157bcab5d582d59fa8258e'
and 'a99dc9b34551aa3889d7057538bf2e37b0471af1'
| -rw-r--r-- | classes/patch.bbclass | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-cups-backend_3.23.bb | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-gstreamer-plugin_3.23.bb | 2 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils-alsa_3.23.bb | 1 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils3.inc | 3 | ||||
| -rw-r--r-- | packages/bluez/bluez-utils_3.23.bb | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 0cc202820f..6f83d9c88b 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -526,7 +526,7 @@ python patch_do_patch() { bb.note("Patch '%s' applies to earlier revisions" % pname) continue - bb.note("Applying patch '%s'" % pname) + bb.note("Applying patch '%s' (%s)" % (pname, unpacked)) try: patchset.Import({"file":unpacked, "remote":url, "strippath": pnum}, True) except: diff --git a/packages/bluez/bluez-cups-backend_3.23.bb b/packages/bluez/bluez-cups-backend_3.23.bb index d92b53220f..46ca0becf0 100644 --- a/packages/bluez/bluez-cups-backend_3.23.bb +++ b/packages/bluez/bluez-cups-backend_3.23.bb @@ -1,5 +1,5 @@ require bluez-utils3.inc - +PR = "r1" DEPENDS += "cups" # see bluez-utils3.inc for the explanation of these option diff --git a/packages/bluez/bluez-gstreamer-plugin_3.23.bb b/packages/bluez/bluez-gstreamer-plugin_3.23.bb index 123259b3a7..36e9ca3d91 100644 --- a/packages/bluez/bluez-gstreamer-plugin_3.23.bb +++ b/packages/bluez/bluez-gstreamer-plugin_3.23.bb @@ -1,5 +1,5 @@ require bluez-utils3.inc - +PR = "r1" DEPENDS += "gstreamer gst-plugins-base " # see bluez-utils3.inc for the explanation of these option diff --git a/packages/bluez/bluez-utils-alsa_3.23.bb b/packages/bluez/bluez-utils-alsa_3.23.bb index 5c4a07e8ab..0d7836fa65 100644 --- a/packages/bluez/bluez-utils-alsa_3.23.bb +++ b/packages/bluez/bluez-utils-alsa_3.23.bb @@ -1,4 +1,5 @@ require bluez-utils3.inc +PR = "r1" DEPENDS += "alsa-lib" diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc index b995d6990c..3932d722ee 100644 --- a/packages/bluez/bluez-utils3.inc +++ b/packages/bluez/bluez-utils3.inc @@ -8,11 +8,14 @@ RREPLACES = "bluez-utils-dbus" RCONFLICTS_${PN} = "bluez-utils-nodbus" LICENSE = "GPL" +FILESPATH = "${FILE_DIRNAME}/bluez-utils-${PV}:${FILE_DIRNAME}/bluez-utils" + # ti patch should be sent it upstream! SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://hcid.conf \ file://hciattach-ti-bts.patch;patch=1" + S = "${WORKDIR}/bluez-utils-${PV}" inherit autotools update-rc.d diff --git a/packages/bluez/bluez-utils_3.23.bb b/packages/bluez/bluez-utils_3.23.bb index f96d1f2ba4..37365f67fc 100644 --- a/packages/bluez/bluez-utils_3.23.bb +++ b/packages/bluez/bluez-utils_3.23.bb @@ -1,5 +1,5 @@ require bluez-utils3.inc -PR = "r1" +PR = "r2" # see bluez-utils3.inc for the explanation of these option EXTRA_OECONF = " \ |