diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-05-24 13:01:00 -0700 |
---|---|---|
committer | Chris Larson <chris_larson@mentor.com> | 2010-05-25 12:54:52 -0700 |
commit | 6fe7cef27069415f2eba36bc640cf59013d4979b (patch) | |
tree | b0cb8845ddc6b8bcffc50e08a2eeae98e049be98 /recipes/qmake | |
parent | bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 (diff) | |
download | openembedded-6fe7cef27069415f2eba36bc640cf59013d4979b.tar.gz |
Make the do_patch apply=yes param implicit if extension is .diff/.patch
For .diff/.patch you need to apply manually, you can specify apply=no.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/qmake')
-rw-r--r-- | recipes/qmake/qmake2.inc | 6 | ||||
-rw-r--r-- | recipes/qmake/qmake2_2.10a.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc index 91c969a8d2..0e0f9cd55a 100644 --- a/recipes/qmake/qmake2.inc +++ b/recipes/qmake/qmake2.inc @@ -11,9 +11,9 @@ DEPENDS = "uicmoc4-native" QTVER = "qt-embedded-linux-opensource-src-${QTVERSION}" SRC_URI = "ftp://ftp.trolltech.com/qt/source/${QTVER}.tar.bz2 \ - file://0001-fix-mkspecs.patch;apply=yes \ - file://qt-config.patch;apply=yes \ - file://use-lflags-last.patch;apply=yes \ + file://0001-fix-mkspecs.patch \ + file://qt-config.patch \ + file://use-lflags-last.patch \ file://linux-oe-qmake.conf" S = "${WORKDIR}/${QTVER}" diff --git a/recipes/qmake/qmake2_2.10a.bb b/recipes/qmake/qmake2_2.10a.bb index 2533a96608..d07f68baa5 100644 --- a/recipes/qmake/qmake2_2.10a.bb +++ b/recipes/qmake/qmake2_2.10a.bb @@ -5,7 +5,7 @@ BBCLASSEXTEND = "native sdk" require ${PN}.inc -SRC_URI += "file://qmake-hack.diff;apply=yes" +SRC_URI += "file://qmake-hack.diff" do_install() { install -d ${D}/${bindir} |