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/glib-2.0/glib-2.0_2.20.4.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/glib-2.0/glib-2.0_2.20.4.bb')
-rw-r--r-- | recipes/glib-2.0/glib-2.0_2.20.4.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes/glib-2.0/glib-2.0_2.20.4.bb b/recipes/glib-2.0/glib-2.0_2.20.4.bb index 76a95852ba..3d8bb77cd7 100644 --- a/recipes/glib-2.0/glib-2.0_2.20.4.bb +++ b/recipes/glib-2.0/glib-2.0_2.20.4.bb @@ -4,9 +4,9 @@ PR = "${INC_PR}.0" SRC_URI = "\ http://ftp.gnome.org/pub/GNOME/sources/glib/2.20/glib-${PV}.tar.bz2 \ file://glibconfig-sysdefs.h \ - file://configure-libtool.patch;patch=1 \ + file://configure-libtool.patch \ " -SRC_URI_append_arm = " file://atomic-thumb.patch;patch=1" +SRC_URI_append_arm = " file://atomic-thumb.patch" SRC_URI[md5sum] = "346916673c0eab72191cf44b4afe535f" SRC_URI[sha256sum] = "af709f0eabfbbfa5c59a02764ca1dd5e6509bbe7fb67a474b2c448bda7b06fb9" |