aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/fam/fam_2.7.0.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-05-27 12:44:07 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-05-27 12:44:07 +0200
commit293b05335ab540c4c8402e0a5caf2886b786a318 (patch)
tree11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/fam/fam_2.7.0.bb
parent1ee2156592ba17f64f3c9b8970285a259730b871 (diff)
parente9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff)
downloadopenembedded-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/fam/fam_2.7.0.bb')
-rw-r--r--recipes/fam/fam_2.7.0.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes/fam/fam_2.7.0.bb b/recipes/fam/fam_2.7.0.bb
index 44fab1b833..cca391593e 100644
--- a/recipes/fam/fam_2.7.0.bb
+++ b/recipes/fam/fam_2.7.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
LICENSE = "GPL LGPL"
SRC_URI = "ftp://oss.sgi.com/projects/fam/download/stable/fam-${PV}.tar.gz \
- file://compile-fix.patch;patch=1"
+ file://compile-fix.patch"
inherit autotools