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/e17/places_svn.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/e17/places_svn.bb')
-rw-r--r-- | recipes/e17/places_svn.bb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/recipes/e17/places_svn.bb b/recipes/e17/places_svn.bb index 13ef860f77..d6ab46d7e1 100644 --- a/recipes/e17/places_svn.bb +++ b/recipes/e17/places_svn.bb @@ -5,15 +5,12 @@ PR = "r4" require e-module.inc -SRC_URI += "file://fix-api.diff;patch=1;maxrev=39830;pnum=3" +SRC_URI += "file://fix-api.diff;maxrev=39830;striplevel=3" do_configure_prepend() { - sed -i -e /po/d -e /AM_GNU_GETTEXT/d configure.ac + sed -i -e /po/d -e /AM_GNU_GETTEXT/d configure.ac sed -i -e s:\ po::g Makefile.am } # Calls /usr/bin/eject for media RRECOMMENDS_${PN} += "eject" - - - |