diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/mtd/mtd-utils_1.2.0+git.bb | |
parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/mtd/mtd-utils_1.2.0+git.bb')
-rw-r--r-- | recipes/mtd/mtd-utils_1.2.0+git.bb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes/mtd/mtd-utils_1.2.0+git.bb b/recipes/mtd/mtd-utils_1.2.0+git.bb index 8ea5424d71..4d73c83dc9 100644 --- a/recipes/mtd/mtd-utils_1.2.0+git.bb +++ b/recipes/mtd/mtd-utils_1.2.0+git.bb @@ -11,9 +11,9 @@ ARM_INSTRUCTION_SET = "arm" TAG = "ea429635388f7bb53f62c41ec3d5ccf5fa207370" SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ - file://add-exclusion-to-mkfs-jffs2-git-2.patch;patch=1 \ - file://fix-ignoreerrors-git.patch;patch=1 \ - file://lzo_1x-git.patch;patch=1" + file://add-exclusion-to-mkfs-jffs2-git-2.patch \ + file://fix-ignoreerrors-git.patch \ + file://lzo_1x-git.patch" S = "${WORKDIR}/git/" |