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

8 files changed, 322 insertions, 99 deletions

diff --git a/classes/gitver.bbclass b/classes/gitver.bbclass
new file mode 100644
index 0000000000..92c053ae24
--- /dev/null
+++ b/classes/gitver.bbclass
@@ -0,0 +1,54 @@
+# Copyright (C) 2009 Chris Larson <clarson@kergoth.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# gitver.bbclass provides a GITVER variable which is a (fairly) sane version,
+# for use in ${PV}, extracted from the ${S} git checkout, assuming it is one.
+# This is most useful in concert with srctree.bbclass.
+
+
+GITVER = "${@get_git_pv('${S}', d)}"
+
+def gitver_mark_dependency(d):
+    from bb.data import expand
+    from bb.parse import mark_dependency
+    from os.path import abspath
+
+    fn = abspath(expand("${S}/.git/HEAD", d))
+    mark_dependency(d, fn)
+
+def get_git_pv(path, d, tagadjust=None):
+    from subprocess import Popen, PIPE
+    from os.path import join
+    from bb import error
+
+    env = {"GIT_DIR": join(d.getVar("S", True), ".git")}
+
+    def popen(cmd, **kwargs):
+        kwargs["stderr"] = PIPE
+        kwargs["stdout"] = PIPE
+        kwargs["env"] = env
+        try:
+            pipe = Popen(cmd, **kwargs)
+        except OSError, e:
+            #error("Execution of %s failed: %s" % (cmd, e))
+            return
+
+        (stdout, stderr) = pipe.communicate(None)
+        if pipe.returncode != 0:
+            #error("Execution of %s failed: %s" % (cmd, stderr))
+            return
+        return stdout.rstrip()
+
+    gitver_mark_dependency(d)
+
+    ver = popen(["git", "describe", "--tags"], cwd=path)
+    if not ver:
+        ver = popen(["git", "rev-parse", "--short", "HEAD"], cwd=path)
+        if ver:
+            return "0.0-%s" % ver
+        else:
+            return "0.0"
+    else:
+        if tagadjust:
+            ver = tagadjust(ver)
+        return ver
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index e3a7522619..e5561082fd 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -266,10 +266,9 @@ python do_package_ipk () {
 			ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces))
 		if rconflicts:
 			ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts))
-		src_uri = bb.data.getVar("SRC_URI", localdata, 1)
-		if src_uri:
-			src_uri = re.sub("\s+", " ", src_uri)
-			ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
+		src_uri = bb.data.getVar("SRC_URI", localdata, 1) or d.getVar("FILE", True)
+		src_uri = re.sub("\s+", " ", src_uri)
+		ctrlfile.write("Source: %s\n" % " ".join(src_uri.split()))
 		ctrlfile.close()
 
 		for script in ["preinst", "postinst", "prerm", "postrm"]:
diff --git a/classes/srctree.bbclass b/classes/srctree.bbclass
new file mode 100644
index 0000000000..2a324cf1be
--- /dev/null
+++ b/classes/srctree.bbclass
@@ -0,0 +1,141 @@
+# Copyright (C) 2009 Chris Larson <clarson@kergoth.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+#
+# srctree.bbclass enables operation inside of an existing source tree for a
+# project, rather than using the fetch/unpack/patch idiom.
+#
+# By default, it expects that you're keeping the recipe(s) inside the
+# aforementioned source tree, but you could override S to point at an external
+# directory and place the recipes in a normal collection/overlay, if you so
+# chose.
+#
+# It also provides some convenience python functions for assembling your
+# do_clean, if you want to leverage things like 'git clean' to simplify the
+# operation.
+
+
+S = "${FILE_DIRNAME}"
+SRC_URI = ""
+
+#TYPE = "${@'${PN}'.replace('${BPN}', '').strip()}"
+#WORKDIR = "${S}/tmp${TYPE}.${MULTIMACH_HOST_SYS}"
+#STAMP = "${WORKDIR}/tasks/stamp"
+#WORKDIR_LOCAL = "${S}/tmp${TYPE}.${MULTIMACH_HOST_SYS}"
+#T = "${WORKDIR_LOCAL}/bitbake-tasks"
+
+# Hack, so things don't explode in builds that don't inherit package
+do_package ?= "    pass"
+do_package[func] = "1"
+do_package[python] = "1"
+
+# Ensure that do_package depends on populate_staging, rather than install
+addtask package after do_populate_staging
+
+# This stuff is needed to facilitate variants (normal, native, cross, sdk)
+# that share a ${S}.  It's ugly as hell.  Only really necessary for recipes
+# that can't use a ${B}, and which have variants like native.  Not sure what
+# the best solution is long term.
+#
+# We merge configure+compile+install into the populate_staging task, uses a
+# lock file.  This ensures that none of the tasks which access ${S} can
+# interleave amongst the recipes that share that ${S}.
+
+def variant_hack(d):
+	from itertools import chain
+
+	# Kill dependencies on the fromtasks
+	fromtasks = ["do_configure", "do_compile", "do_install"]
+	for key in d.keys():
+		task = d.getVarFlag(key, "task")
+		if task:
+			deps = d.getVarFlag(key, "deps")
+			for task_ in fromtasks:
+				if task_ in deps:
+					deps.remove(task_)
+			# if not key in fromtasks + ["do_populate_staging"]:
+			#	 deps.append("do_populate_staging")
+			d.setVarFlag(key, "deps", deps)
+
+	# Pull the task deps from fromtasks over to the new task, minus deltasks
+	deltasks = ("do_patch", "do_unpack", "do_fetch")
+	deps = set(chain(*[(d.getVarFlag(old, "deps")) for old in fromtasks + ["do_populate_staging"]]))
+	d.setVarFlag("do_populate_staging", "deps", deps.difference(deltasks))
+
+	# Pull cross recipe task deps over
+	d.setVarFlag("do_populate_staging", "depends", " ".join((d.getVarFlag(old, "depends") or "" for old in fromtasks)))
+
+python () {
+	variant_hack(d)
+}
+
+python do_populate_staging () {
+	from bb.build import exec_task, exec_func
+
+	exec_task("do_configure", d)
+	exec_task("do_compile", d)
+	exec_task("do_install", d)
+	exec_func("do_stage", d)
+}
+do_populate_staging[lockfiles] += "${S}/.lock"
+
+make_do_clean () {
+	oe_runmake clean
+}
+
+def clean_builddir(d):
+	from shutil import rmtree
+
+	builddir = d.getVar("B", True)
+	srcdir = d.getVar("S", True)
+	if builddir != srcdir:
+		rmtree(builddir, ignore_errors=True)
+
+def clean_stamps(d):
+	from glob import glob
+	from bb import note
+	from bb.data import expand
+	from os import unlink
+
+	note("Removing stamps")
+	for stamp in glob(expand('${STAMP}.*', d)):
+		try:
+			unlink(stamp)
+		except OSError:
+			pass
+
+def clean_workdir(d):
+	from shutil import rmtree
+	from bb import note
+
+	workdir = d.getVar("WORKDIR", 1)
+	note("Removing %s" % workdir)
+	rmtree(workdir, ignore_errors=True)
+
+def clean_git(d):
+	from subprocess import call
+
+	call(["git", "clean", "-d", "-f", "-X"], cwd=d.getVar("S", True))
+
+def clean_make(d):
+	import bb
+
+	bb.note("Running make clean")
+	try:
+		bb.build.exec_func("make_do_clean", d)
+	except bb.build.FuncFailed:
+		pass
+
+python do_clean () {
+	from os.path import exists
+	from bb.build import FuncFailed
+	from bb.data import expand
+
+	clean_stamps(d)
+	clean_workdir(d)
+	if exists(expand("${S}/.git", d)) and \
+	   exists(expand("${S}/.gitignore", d)):
+		clean_git(d)
+	else:
+		clean_builddir(d)
+		clean_make(d)
+}
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ab8b320cb5..46ac3884cc 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -21722,6 +21722,10 @@ sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
 md5=2122d460b4119749c6e5993938a9b501
 sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169
 
+[http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz]
+md5=e9865d093a18e4668b9d31b635dc8e99
+sha256=33cc969364cb66b3e345fa7db2c651a8e07de0e58743ec03899c4ba86953e1b3
+
 [http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip]
 md5=c7536e907363ea1da63430b49e42931d
 sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29
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_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/rsync/rsync_3.0.6.bb b/recipes/rsync/rsync_3.0.6.bb
new file mode 100644
index 0000000000..f2a8eee3fb
--- /dev/null
+++ b/recipes/rsync/rsync_3.0.6.bb
@@ -0,0 +1,10 @@
+require rsync.inc
+
+SRC_URI += "\
+  file://m4.patch;patch=1 \
+  file://rsyncd.conf \
+"
+# The source tarball from 3.0.6 seems to need this
+do_configure_append(){
+  oe_runmake reconfigure
+}