[oe-commits] org.oe.dev bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly.

pfalcon commit openembedded-commits at lists.openembedded.org
Mon Jan 28 00:15:22 UTC 2008


bluez-utils 3.23 and friends: Set FILESPATH explicitly and correctly.
* Having a "files" dir in a multi-package directory is shooting everyone
in leg. There should be per-package dirs or else stuff will be taken from
god-knows-where.
* So, add FILESPATH for all bluez-utils descendant packages.
* This fixes build of bluez-cups-backend, which failed in do_patch
because some patch wa taken from wrong, catch-all "files" dir.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 33c44c7c7ce5fce5da6c869be191126d5fca6f96
ViewMTN: http://monotone.openembedded.org/revision/info/33c44c7c7ce5fce5da6c869be191126d5fca6f96
Files:
1
packages/bluez/bluez-cups-backend_3.23.bb
packages/bluez/bluez-gstreamer-plugin_3.23.bb
packages/bluez/bluez-utils-alsa_3.23.bb
packages/bluez/bluez-utils3.inc
packages/bluez/bluez-utils_3.23.bb
Diffs:

#
# mt diff -r9814a7ac8b5ebeadd190ad216196e5efd3a70ff3 -r33c44c7c7ce5fce5da6c869be191126d5fca6f96
#
# 
# 
# patch "packages/bluez/bluez-cups-backend_3.23.bb"
#  from [bc43b7c062d229869f1202c10c67f7ab26a327e0]
#    to [1e66f4ef912ceab694ca76eb3b8cd79156724046]
# 
# patch "packages/bluez/bluez-gstreamer-plugin_3.23.bb"
#  from [fb6efa105f94dbd193aed80095f24c7cc0e70355]
#    to [2291a69c590e3f7708cdf2d47efe32998fcdb7ed]
# 
# patch "packages/bluez/bluez-utils-alsa_3.23.bb"
#  from [7a8b78b118f7dc36dfcca67ece0c3004da5415df]
#    to [8af83a704602760f9d8167ef0efa93dd24817759]
# 
# patch "packages/bluez/bluez-utils3.inc"
#  from [f1cbdfc74564a82c238bb6862de2fcbadb369e01]
#    to [3ae629dcab5f90f03d9a52c099f562c86f8f431b]
# 
# patch "packages/bluez/bluez-utils_3.23.bb"
#  from [e19b966dd298ba92c4980f3df32211c2eeffc8f1]
#    to [9b5873bc1f92f70365ffaf73cb383d0478d2a749]
# 
============================================================
--- packages/bluez/bluez-cups-backend_3.23.bb	bc43b7c062d229869f1202c10c67f7ab26a327e0
+++ packages/bluez/bluez-cups-backend_3.23.bb	1e66f4ef912ceab694ca76eb3b8cd79156724046
@@ -1,5 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
-
+PR = "r1"
 DEPENDS += "cups"
 
 # see bluez-utils3.inc for the explanation of these option
============================================================
--- packages/bluez/bluez-gstreamer-plugin_3.23.bb	fb6efa105f94dbd193aed80095f24c7cc0e70355
+++ packages/bluez/bluez-gstreamer-plugin_3.23.bb	2291a69c590e3f7708cdf2d47efe32998fcdb7ed
@@ -1,5 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
-
+PR = "r1"
 DEPENDS += "gstreamer gst-plugins-base "
 
 # see bluez-utils3.inc for the explanation of these option
============================================================
--- packages/bluez/bluez-utils-alsa_3.23.bb	7a8b78b118f7dc36dfcca67ece0c3004da5415df
+++ packages/bluez/bluez-utils-alsa_3.23.bb	8af83a704602760f9d8167ef0efa93dd24817759
@@ -1,4 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
+PR = "r1"
 
 DEPENDS += "alsa-lib"
 
============================================================
--- packages/bluez/bluez-utils3.inc	f1cbdfc74564a82c238bb6862de2fcbadb369e01
+++ packages/bluez/bluez-utils3.inc	3ae629dcab5f90f03d9a52c099f562c86f8f431b
@@ -8,11 +8,14 @@ LICENSE = "GPL"
 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
============================================================
--- packages/bluez/bluez-utils_3.23.bb	e19b966dd298ba92c4980f3df32211c2eeffc8f1
+++ packages/bluez/bluez-utils_3.23.bb	9b5873bc1f92f70365ffaf73cb383d0478d2a749
@@ -1,5 +1,5 @@ require bluez-utils3.inc
 require bluez-utils3.inc
-PR = "r1"
+PR = "r2"
 
 # see bluez-utils3.inc for the explanation of these option
 EXTRA_OECONF = " \






More information about the Openembedded-commits mailing list