Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

47 files changed, 314 insertions, 307 deletions

diff --git a/recipes/dmidecode/dmidecode_2.10.bb b/recipes/dmidecode/dmidecode_2.10.bb
new file mode 100644
index 0000000000..d3a646dfd1
--- /dev/null
+++ b/recipes/dmidecode/dmidecode_2.10.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "DMI (Desktop Management Interface) table related utilities"
+HOMEPAGE = "http://www.nongnu.org/dmidecode/"
+LICENSE = "GPLv2"
+PR = "r0"
+
+SRC_URI = "http://savannah.nongnu.org/download/dmidecode/${P}.tar.bz2"
+
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
+
+do_install() {
+	oe_runmake DESTDIR="${D}" install
+}
diff --git a/recipes/ecj/libecj-bootstrap_3.5.bb b/recipes/ecj/libecj-bootstrap_3.5.bb
index 1665b337b6..005000eb4b 100644
--- a/recipes/ecj/libecj-bootstrap_3.5.bb
+++ b/recipes/ecj/libecj-bootstrap_3.5.bb
@@ -1,3 +1,7 @@
+# Causes problems with openjdk/icedtea. See Eclipse bug eclipse bug #285466
+# Might get fixed in IcedTea 1.6
+DEFAULT_PREFERENCE = "-1"
+
 require libecj-bootstrap.inc
 
 PR = "r0"
diff --git a/recipes/gdb/gdb-canadian-sdk_6.8.bb b/recipes/gdb/gdb-canadian-sdk_6.8.bb
index 1eefddc917..db45cfdf16 100644
--- a/recipes/gdb/gdb-canadian-sdk_6.8.bb
+++ b/recipes/gdb/gdb-canadian-sdk_6.8.bb
@@ -1,8 +1,10 @@
 require gdb-canadian-cross.inc
+LICENSE = "GPLv3"
 
 SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
 	    file://gdb-6.8-mingw-3.patch;patch=1 \
 	    file://gdb-6.8-pr9638-ppc-canadian-configh.patch;patch=1 \
+	    file://gdb-6.8-fix-compile-karmic.patch;patch=1 \
 	    file://gdb-6.8-mips-mingw-sim-fixup.patch;patch=1"
 
 PR = "r1"
diff --git a/recipes/gdb/gdb-cross-sdk_6.8.bb b/recipes/gdb/gdb-cross-sdk_6.8.bb
index 66e1454779..6d6fba7993 100644
--- a/recipes/gdb/gdb-cross-sdk_6.8.bb
+++ b/recipes/gdb/gdb-cross-sdk_6.8.bb
@@ -1,4 +1,5 @@
 require gdb-cross.inc
+LICENSE = "GPLv3"
 
 SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
             file://gdb-6.8-fix-compile-karmic.patch;patch=1"
diff --git a/recipes/gdb/gdb-cross_6.8.bb b/recipes/gdb/gdb-cross_6.8.bb
index 664ab5e323..2c24d4cac8 100644
--- a/recipes/gdb/gdb-cross_6.8.bb
+++ b/recipes/gdb/gdb-cross_6.8.bb
@@ -1,6 +1,8 @@
 require gdb-cross.inc
+LICENSE = "GPLv3"
 
-SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0"
+SRC_URI += "file://gcc-4.3-build-error.patch;patch=1;pnum=0 \
+            file://gdb-6.8-fix-compile-karmic.patch;patch=1"
 
 inherit cross
 
diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb
index cc795e14a5..6449c82c8a 100644
--- a/recipes/gnome/gnome-games_2.24.0.bb
+++ b/recipes/gnome/gnome-games_2.24.0.bb
@@ -24,7 +24,10 @@ do_configure_prepend() {
 
 do_configure_append() {
 	for i in $(find ${S} -name "Makefile") ; do
-		sed -i -e s:'I/usr/include'::g -e s:'-I /usr/include -I /usr/local/include'::g $i
+		sed -i \
+			-e s:'-I/usr/include/SDL':'-I${STAGING_INCDIR}/SDL':g \
+			-e s:'-I/usr/local/include/SDL':'-I${STAGING_INCDIR}/SDL':g \
+			$i
 	done	
 }
 
diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 62c6d16f6b..a1482fbf4b 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24.4
-# Wed Jul 29 12:54:46 2009
+# Mon Aug 24 09:09:25 2009
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -48,7 +48,8 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_FAIR_GROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 # CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 # CONFIG_EMBEDDED is not set
diff --git a/recipes/linux/linux-2.6.29/boc01/007-081217-lm73.patch b/recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch
index ec2a4e40e8..8ffae6a2b0 100644
--- a/recipes/linux/linux-2.6.29/boc01/007-081217-lm73.patch
+++ b/recipes/linux/linux-2.6.29/boc01/007-090825-lm73.patch
@@ -1,7 +1,7 @@
 Index: linux-2.6.29/drivers/hwmon/Kconfig
 ===================================================================
---- linux-2.6.29.orig/drivers/hwmon/Kconfig	2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/hwmon/Kconfig	2009-04-01 17:37:50.000000000 +0200
+--- linux-2.6.29.orig/drivers/hwmon/Kconfig	2009-08-25 17:33:48.000000000 +0200
++++ linux-2.6.29/drivers/hwmon/Kconfig	2009-08-25 17:34:24.000000000 +0200
 @@ -448,6 +448,15 @@
  	  This driver can also be built as a module.  If so, the module
  	  will be called lm70.
@@ -21,16 +21,18 @@ Index: linux-2.6.29/drivers/hwmon/Kconfig
 Index: linux-2.6.29/drivers/hwmon/lm73.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ linux-2.6.29/drivers/hwmon/lm73.c	2009-04-01 17:37:50.000000000 +0200
-@@ -0,0 +1,232 @@
++++ linux-2.6.29/drivers/hwmon/lm73.c	2009-08-25 18:43:49.000000000 +0200
+@@ -0,0 +1,243 @@
 + /*
 + * LM73 Sensor driver
 + * Based on LM75
 + *
-+ *
 + * Copyright (C) 2007, CenoSYS (www.cenosys.com).
-+ * Guillaume Ligneul
-+ * Guillaume.ligneul@gmail.com
++ * Copyright (C) 2009, Bollore telecom (www.bolloretelecom.eu).
++ *
++ * Guillaume Ligneul (Guillaume.ligneul@gmail.com)
++ * Adrien Demarez <adrien.demarez@bolloretelecom.eu>
++ * Jeremy Laine <jeremy.laine@bolloretelecom.eu>
 + *
 + * This software program is licensed subject to the GNU General Public License
 + * (GPL).Version 2,June 1991, available at http://www.fsf.org/copyleft/gpl.html
@@ -47,7 +49,7 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +#include <linux/mutex.h>
 +
 +
-+/* Addresses to scan */
++/* Addresses scanned */
 +static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
 +					0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
 +
@@ -55,57 +57,44 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +I2C_CLIENT_INSMOD_1(lm73);
 +
 +/* LM73 registers */
-+#define LM73_REG_INPUT		0x00
 +#define LM73_REG_CONF		0x01
-+#define LM73_REG_T_HIGH		0x02
-+#define LM73_REG_T_LOW		0x03
-+
 +static const u8 LM73_REG_TEMP[3] = {
-+	LM73_REG_INPUT,		/* input */
-+	LM73_REG_T_HIGH,	/* max */
-+	LM73_REG_T_LOW,		/* min	*/
++	0x00,		/* input */
++	0x02,		/* max */
++	0x03,		/* min	*/
 +};
 +
 +/* Each client has this additional data */
 +struct lm73_data {
-+	struct i2c_client	client;
-+	struct device *hwmon_dev;
++	struct device		*hwmon_dev;
 +	struct mutex		update_lock;
-+	char			valid;		/* !=0 if following fields are valid */
-+	unsigned long		last_updated;	/* In jiffies */
 +	u16			temp[3];	/* Register values,
 +						   0 = input
 +						   1 = max
 +						   2 = min */
 +};
 +
-+static int lm73_attach_adapter(struct i2c_adapter *adapter);
-+static int lm73_detect(struct i2c_adapter *adapter, int address, int kind);
-+static int lm73_detach_client(struct i2c_client *client);
 +static int lm73_read_value(struct i2c_client *client, u8 reg);
 +static int lm73_write_value(struct i2c_client *client, u8 reg, short value);
 +
-+/* This is the driver that will be inserted */
-+static struct i2c_driver lm73_driver = {
-+	.driver = {
-+		.name	= "lm73",
-+	},
-+	.attach_adapter	= lm73_attach_adapter,
-+	.detach_client	= lm73_detach_client,
-+};
++
++/*-----------------------------------------------------------------------*/
++
++/* sysfs attributes for hwmon */
 +
 +static ssize_t show_temp(struct device *dev, struct device_attribute *da,
 +			 char *buf)
 +{
 +	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
 +	struct i2c_client *client = to_i2c_client(dev);
++	struct lm73_data *data = i2c_get_clientdata(client);
 +	int iTemp = 0;
 +
++	mutex_lock(&data->update_lock);
 +	iTemp = lm73_read_value(client, LM73_REG_TEMP[attr->index]);
++	mutex_unlock(&data->update_lock);
 +
 +	return sprintf(buf, "%d\n", iTemp);
-+
-+
 +}
 +
 +static ssize_t set_temp(struct device *dev, struct device_attribute *da,
@@ -113,11 +102,13 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +{
 +	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
 +	struct i2c_client *client = to_i2c_client(dev);
++	struct lm73_data *data = i2c_get_clientdata(client);
 +	int nr = attr->index;
++	long temp = simple_strtol(buf, NULL, 10);
 +
-+	long tmp = simple_strtol(buf, NULL, 10);
-+
-+	lm73_write_value(client, LM73_REG_TEMP[nr], tmp);
++	mutex_lock(&data->update_lock);
++	lm73_write_value(client, LM73_REG_TEMP[nr], temp);
++	mutex_unlock(&data->update_lock);
 +	return count;
 +}
 +
@@ -127,13 +118,6 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +			show_temp, set_temp, 2);
 +static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
 +
-+static int lm73_attach_adapter(struct i2c_adapter *adapter)
-+{
-+	if (!(adapter->class & I2C_CLASS_HWMON))
-+		return 0;
-+
-+	return i2c_probe(adapter, &addr_data, lm73_detect);
-+}
 +
 +static struct attribute *lm73_attributes[] = {
 +	&sensor_dev_attr_temp1_input.dev_attr.attr,
@@ -147,85 +131,111 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +	.attrs = lm73_attributes,
 +};
 +
-+/* This function is called by i2c_probe */
-+static int lm73_detect(struct i2c_adapter *adapter, int address, int kind)
-+{
-+	struct i2c_client *new_client;
-+	struct lm73_data *data;
-+	int err = 0;
-+	const char *name = "";
++/*-----------------------------------------------------------------------*/
 +
-+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
-+				     I2C_FUNC_SMBUS_WORD_DATA))
-+		goto exit;
++/* device probe and removal */
 +
-+	if (!(data = kzalloc(sizeof(struct lm73_data), GFP_KERNEL))) {
-+		err = -ENOMEM;
-+		goto exit;
-+	}
++static int
++lm73_probe(struct i2c_client *client, const struct i2c_device_id *id)
++{
++	struct lm73_data *data;
++	int status;
 +
-+	new_client = &data->client;
-+	i2c_set_clientdata(new_client, data);
-+	new_client->addr = address;
-+	new_client->adapter = adapter;
-+	new_client->driver = &lm73_driver;
-+	new_client->flags = 0;
++	if (!i2c_check_functionality(client->adapter,
++			I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA))
++            return -EIO;
 +
-+	name = "lm73";
++	data = kzalloc(sizeof(struct lm73_data), GFP_KERNEL);
++	if (!data)
++		return -ENOMEM;
 +
-+	/* Fill in the remaining client fields and put it into the global list */
-+	strlcpy(new_client->name, name, I2C_NAME_SIZE);
-+	data->valid = 0;
++	i2c_set_clientdata(client, data);
 +	mutex_init(&data->update_lock);
 +
-+	/* Tell the I2C layer a new client has arrived */
-+	if ((err = i2c_attach_client(new_client)))
-+		goto exit_free;
-+
 +	/* Register sysfs hooks */
-+	if ((err = sysfs_create_group(&new_client->dev.kobj, &lm73_group)))
-+		goto exit_detach;
++	status = sysfs_create_group(&client->dev.kobj, &lm73_group);
++	if (status)
++        	goto exit_free;
 +
-+	data->hwmon_dev = hwmon_device_register(&new_client->dev);
++	data->hwmon_dev = hwmon_device_register(&client->dev);
 +	if (IS_ERR(data->hwmon_dev)) {
-+		err = PTR_ERR(data->hwmon_dev);
++		status = PTR_ERR(data->hwmon_dev);
 +		goto exit_remove;
 +	}
 +
++	dev_info(&client->dev, "%s: sensor '%s'\n",
++		 dev_name(data->hwmon_dev), client->name);
++
 +	return 0;
 +
 +exit_remove:
-+	sysfs_remove_group(&new_client->dev.kobj, &lm73_group);
-+exit_detach:
-+	i2c_detach_client(new_client);
++	sysfs_remove_group(&client->dev.kobj, &lm73_group);
 +exit_free:
++	i2c_set_clientdata(client, NULL);
 +	kfree(data);
-+exit:
-+	return err;
++	return status;
 +}
 +
-+static int lm73_detach_client(struct i2c_client *client)
++static int lm73_remove(struct i2c_client *client)
 +{
 +	struct lm73_data *data = i2c_get_clientdata(client);
++
 +	hwmon_device_unregister(data->hwmon_dev);
 +	sysfs_remove_group(&client->dev.kobj, &lm73_group);
-+	i2c_detach_client(client);
++	i2c_set_clientdata(client, NULL);
 +	kfree(data);
 +	return 0;
 +}
 +
++static const struct i2c_device_id lm73_ids[] = {
++	{ "lm73", lm73 },
++	{ /* LIST END */ }
++};
++MODULE_DEVICE_TABLE(i2c, lm73_ids);
++
++/* Return 0 if detection is successful, -ENODEV otherwise */
++static int lm73_detect(struct i2c_client *new_client, int kind,
++		       struct i2c_board_info *info)
++{
++	struct i2c_adapter *adapter = new_client->adapter;
++
++	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA |
++				     I2C_FUNC_SMBUS_WORD_DATA))
++		return -ENODEV;
++
++	/* NOTE: we treat "force=..." and "force_lm73=..." the same.
++	 * Only new-style driver binding distinguishes chip types.
++	 */
++	strlcpy(info->type, "lm73", I2C_NAME_SIZE);
++
++	return 0;
++}
++
++static struct i2c_driver lm73_driver = {
++	.class		= I2C_CLASS_HWMON,
++	.driver = {
++		.name	= "lm73",
++	},
++	.probe		= lm73_probe,
++	.remove		= lm73_remove,
++	.id_table	= lm73_ids,
++	.detect		= lm73_detect,
++	.address_data	= &addr_data,
++};
++
++/*-----------------------------------------------------------------------*/
++
++/* register access */
++
 +static int lm73_read_value(struct i2c_client *client, u8 reg)
 +{
-+	short sVal;
++	short value;
 +
 +	if (reg == LM73_REG_CONF)
 +		return i2c_smbus_read_byte_data(client, reg);
-+	else
-+	{
-+		sVal = swab16(i2c_smbus_read_word_data(client, reg));
-+		sVal = sVal >> 7;
-+		return sVal;
-+	}
++
++	value = swab16(i2c_smbus_read_word_data(client, reg)) >> 7;
++	return value;
 +}
 +
 +static int lm73_write_value(struct i2c_client *client, u8 reg, short value)
@@ -233,12 +243,13 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +	if (reg == LM73_REG_CONF)
 +		return i2c_smbus_write_byte_data(client, reg, value);
 +	else
-+	{
-+		value = value<<7;
-+		return i2c_smbus_write_word_data(client, reg, swab16(value));
-+	}
++		return i2c_smbus_write_word_data(client, reg, swab16(value<<7));
 +}
 +
++/*-----------------------------------------------------------------------*/
++
++/* module glue */
++
 +static int __init sensors_lm73_init(void)
 +{
 +	return i2c_add_driver(&lm73_driver);
@@ -257,8 +268,8 @@ Index: linux-2.6.29/drivers/hwmon/lm73.c
 +module_exit(sensors_lm73_exit);
 Index: linux-2.6.29/drivers/hwmon/Makefile
 ===================================================================
---- linux-2.6.29.orig/drivers/hwmon/Makefile	2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29/drivers/hwmon/Makefile	2009-04-01 17:37:50.000000000 +0200
+--- linux-2.6.29.orig/drivers/hwmon/Makefile	2009-08-25 17:33:48.000000000 +0200
++++ linux-2.6.29/drivers/hwmon/Makefile	2009-08-25 17:34:24.000000000 +0200
 @@ -54,6 +54,7 @@
  obj-$(CONFIG_SENSORS_LIS3LV02D) += lis3lv02d.o hp_accel.o
  obj-$(CONFIG_SENSORS_LM63)	+= lm63.o
diff --git a/recipes/linux/linux-2.6.29/boc01/boc01.dts b/recipes/linux/linux-2.6.29/boc01/boc01.dts
index 710ef8fec0..2066652695 100644
--- a/recipes/linux/linux-2.6.29/boc01/boc01.dts
+++ b/recipes/linux/linux-2.6.29/boc01/boc01.dts
@@ -128,6 +128,10 @@
 					compatible = "isl12024";
 					reg = <0x6f>;
 				};
+				dtt@49 {
+					compatible = "national,lm73";
+					reg = <0x49>;
+				};
 				at24@50 {
 					compatible = "at24,24c32";
 					reg = <0x50>;
diff --git a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
index 82cb12c575..f3935eb90a 100644
--- a/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
+++ b/recipes/linux/linux-omap-2.6.29/arch-has-holes.diff
@@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c
 +
 +static int __init meminfo_cmp(const void *_a, const void *_b) {
 +	const struct membank *a = _a, *b = _b;
-+	long cmp = bank_pfn_start(b) - bank_pfn_start(a);
++	long cmp = bank_pfn_start(a) - bank_pfn_start(b);
 +	return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; }
 +
  void __init bootmem_init(void)
diff --git a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
index 7da8bb9f2b..c9f8e9962b 100644
--- a/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
+++ b/recipes/linux/linux-omap-2.6.29/beagleboard/defconfig
@@ -199,7 +199,7 @@ CONFIG_OMAP_BOOT_REASON=y
 # CONFIG_OMAP_MUX is not set
 CONFIG_OMAP_MCBSP=y
 # CONFIG_OMAP_MBOX_FWK is not set
-CONFIG_OMAP_IOMMU=y
+CONFIG_OMAP_IOMMU=m
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
diff --git a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
index 82cb12c575..f3935eb90a 100644
--- a/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
+++ b/recipes/linux/linux-omap-pm-2.6.29/arch-has-holes.diff
@@ -124,7 +124,7 @@ diff -purN git2/arch/arm/mm/init.c git/arch/arm/mm/init.c
 +
 +static int __init meminfo_cmp(const void *_a, const void *_b) {
 +	const struct membank *a = _a, *b = _b;
-+	long cmp = bank_pfn_start(b) - bank_pfn_start(a);
++	long cmp = bank_pfn_start(a) - bank_pfn_start(b);
 +	return cmp < 0 ? -1 : cmp > 0 ? 1 : 0; }
 +
  void __init bootmem_init(void)
diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb
index 275baf97ea..2e9e769820 100644
--- a/recipes/linux/linux_2.6.29.bb
+++ b/recipes/linux/linux_2.6.29.bb
@@ -25,7 +25,7 @@ SRC_URI_append_boc01 = "\
 	file://boc01.dts \
 	file://004-081205-usb.patch;patch=1 \
 	file://005-090226-isl12024.patch;patch=1 \
-	file://007-081217-lm73.patch;patch=1 \
+	file://007-090825-lm73.patch;patch=1 \
 	file://008-081208-spi.patch;patch=1 \
 	file://011-090115-gpio.patch;patch=1 \
 	file://012-090219-capsense.patch;patch=1 \
diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc
index 9cd10eb3e3..d7bfc148c5 100644
--- a/recipes/mesa/mesa-common.inc
+++ b/recipes/mesa/mesa-common.inc
@@ -4,6 +4,8 @@ DESCRIPTION = "An open source implementation of the OpenGL spec"
 HOMEPAGE = "http://mesa3d.org"
 LICENSE = "MIT"
 
+INC_PR = "r7"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \
            ${SOURCEFORGE_MIRROR}/mesa3d/MesaDemos-${PV}.tar.bz2 "
 S = "${WORKDIR}/Mesa-${PV}"
@@ -17,8 +19,10 @@ EXTRA_OECONF = "--enable-glu \
                 --disable-glut \
 	       "
 
-require mesa-tls.inc
-EXTRA_OECONF += "${@get_tls_setting(bb, d)} "
+inherit glx-use-tls
+
+# Package contents vary according to ${MACHINE_DRI_MODULES}.
+PACKAGE_ARCH = "${MACHINE}"
 
 PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_libgl = "${libdir}/libGL.so.*"
@@ -36,4 +40,7 @@ do_stage() {
 		cp -pPr ${S}/include/GL/internal* ${STAGING_INCDIR}/GL/
 }
 
-
+do_install_append () {
+    install -d ${D}/${bindir}
+    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/${bindir}
+}
diff --git a/recipes/mesa/mesa-dri_7.2.bb b/recipes/mesa/mesa-dri_7.2.bb
index 296a254841..93568432bc 100644
--- a/recipes/mesa/mesa-dri_7.2.bb
+++ b/recipes/mesa/mesa-dri_7.2.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
diff --git a/recipes/mesa/mesa-dri_7.4.bb b/recipes/mesa/mesa-dri_7.4.bb
index 296a254841..93568432bc 100644
--- a/recipes/mesa/mesa-dri_7.4.bb
+++ b/recipes/mesa/mesa-dri_7.4.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PE = "1"
-PR = "r6"
+PR = "${INC_PR}.0"
 
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
@@ -21,8 +21,3 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_${PN}-xprogs = "${bindir}/glxdemo ${bindir}/glxgears ${bindir}/glxheads ${bindir}/glxinfo"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
-do_install_append () {
-    install -d ${D}/usr/bin
-    install -m 0755 ${S}/progs/xdemos/{glxdemo,glxgears,glxheads,glxinfo} ${D}/usr/bin/
-}
diff --git a/recipes/mesa/mesa-dri_git.bb b/recipes/mesa/mesa-dri_git.bb
index bca681c76d..4ca1b73122 100644
--- a/recipes/mesa/mesa-dri_git.bb
+++ b/recipes/mesa/mesa-dri_git.bb
@@ -6,7 +6,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS}"
 
 PV = "7.2+gitr${SRCREV}"
-PR = "r1"
+PR = "${INC_PR}.0"
 PE = "1"
 
 DEFAULT_PREFERENCE = "-1"
@@ -18,4 +18,3 @@ FILES_${PN} += "${libdir}/dri/*.so"
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 
 EXTRA_OECONF += "--with-driver=dri --with-dri-drivers=swrast,${MACHINE_DRI_MODULES}"
-
diff --git a/recipes/mesa/mesa-tls.inc b/recipes/mesa/mesa-tls.inc
deleted file mode 100644
index 1472aa7e74..0000000000
--- a/recipes/mesa/mesa-tls.inc
+++ /dev/null
@@ -1,6 +0,0 @@