summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Hentges <oe@hentges.net>2007-05-24 17:13:15 +0000
committerMatthias Hentges <oe@hentges.net>2007-05-24 17:13:15 +0000
commit1c6e2c60fd35e5272298c62fb9e9fa5c13aa9806 (patch)
tree6b255387649841606b5666eadc356e15c4626a03
parentbc7ef036b41bbd8ea4fd17196ed21e3434621ccd (diff)
parentb21741e8b47255b19fcf81dd9acfaf7f7f2c7053 (diff)
merge of '65710bca464cc1c83f13f67af1f184e2dd527e19'
and '6de428a857bac350bf056ed06d55fadf87e2506d'
-rw-r--r--packages/bluez/bluez-libs_3.11.bb1
-rw-r--r--packages/bluez/bluez-utils_3.11.bb (renamed from packages/bluez/bluez-utils_3.10.1.bb)2
-rw-r--r--packages/mesa/mesa-mesa.inc2
3 files changed, 3 insertions, 2 deletions
diff --git a/packages/bluez/bluez-libs_3.11.bb b/packages/bluez/bluez-libs_3.11.bb
new file mode 100644
index 0000000000..6ddf62a4fb
--- /dev/null
+++ b/packages/bluez/bluez-libs_3.11.bb
@@ -0,0 +1 @@
+require bluez-libs.inc
diff --git a/packages/bluez/bluez-utils_3.10.1.bb b/packages/bluez/bluez-utils_3.11.bb
index 44827dc2d0..6ac6c8f977 100644
--- a/packages/bluez/bluez-utils_3.10.1.bb
+++ b/packages/bluez/bluez-utils_3.11.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
file://hcid.conf \
file://02dtl1_cs.sh \
"
-PR = "r3"
+PR = "r0"
EXTRA_OECONF = " \
--enable-bccmd \
diff --git a/packages/mesa/mesa-mesa.inc b/packages/mesa/mesa-mesa.inc
index a4163f576e..d794f0c097 100644
--- a/packages/mesa/mesa-mesa.inc
+++ b/packages/mesa/mesa-mesa.inc
@@ -13,7 +13,7 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
do_configure() {
cd configs
- ln -sf linux current
+ cp linux current
sed -e "s%CC *= *.*%CC = ${CC}%" -i current
sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current
sed -e "s%LD *= *.*%LD = ${LD}%" -i current