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/gizmod | |
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/gizmod')
-rw-r--r-- | recipes/gizmod/gizmod_2.3.bb | 6 | ||||
-rw-r--r-- | recipes/gizmod/gizmod_3.4.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/gizmod/gizmod_2.3.bb b/recipes/gizmod/gizmod_2.3.bb index 00bd6c27c6..d02cc49a40 100644 --- a/recipes/gizmod/gizmod_2.3.bb +++ b/recipes/gizmod/gizmod_2.3.bb @@ -4,9 +4,9 @@ LICENSE = "GPLv2" SECTION = "console/multimedia" DEPENDS = "python virtual/libx11 xf86vidmodeproto alsa-lib" SRC_URI = "${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \ - file://disable-xmms.patch;patch=1 \ - file://fix-python-configure.patch;patch=1 \ - file://disable-bmp.patch;patch=1" + file://disable-xmms.patch \ + file://fix-python-configure.patch \ + file://disable-bmp.patch" PR = "r0" diff --git a/recipes/gizmod/gizmod_3.4.bb b/recipes/gizmod/gizmod_3.4.bb index d6d485186f..8dfd930ade 100644 --- a/recipes/gizmod/gizmod_3.4.bb +++ b/recipes/gizmod/gizmod_3.4.bb @@ -6,7 +6,7 @@ DEPENDS = "python virtual/libx11 xf86vidmodeproto alsa-lib boost libvisual" SRC_URI = "\ ${SOURCEFORGE_MIRROR}/gizmod/gizmod-${PV}.tar.bz2 \ - file://${PV}-build-fix.patch;patch=1 \ + file://${PV}-build-fix.patch \ " PR = "r0" |