summaryrefslogtreecommitdiff
path: root/recipes/qmake
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-23 20:23:53 -0700
committerChris Larson <chris_larson@mentor.com>2010-05-25 12:53:41 -0700
commitbf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 (patch)
tree96f28e2f5133d68c3e3dadabaa2339340671454f /recipes/qmake
parentfab0af3aefee22b21541e403d3c356a6979bfa63 (diff)
Rename url params patch=<ignored>/pnum=<n> to apply={yes,no}/striplevel=<n>
I think this makes the behavior rather more clear. 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.inc6
-rw-r--r--recipes/qmake/qmake2_2.10a.bb2
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/qmake/qmake2.inc b/recipes/qmake/qmake2.inc
index 2141eafa79..91c969a8d2 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;patch=1 \
- file://qt-config.patch;patch=1 \
- file://use-lflags-last.patch;patch=1 \
+ file://0001-fix-mkspecs.patch;apply=yes \
+ file://qt-config.patch;apply=yes \
+ file://use-lflags-last.patch;apply=yes \
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 ae5816c896..2533a96608 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;patch=1"
+SRC_URI += "file://qmake-hack.diff;apply=yes"
do_install() {
install -d ${D}/${bindir}