summaryrefslogtreecommitdiff
path: root/recipes/wireshark
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-05-24 13:01:00 -0700
committerChris Larson <chris_larson@mentor.com>2010-05-25 12:54:52 -0700
commit6fe7cef27069415f2eba36bc640cf59013d4979b (patch)
treeb0cb8845ddc6b8bcffc50e08a2eeae98e049be98 /recipes/wireshark
parentbf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 (diff)
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/wireshark')
-rw-r--r--recipes/wireshark/wireshark.inc8
-rw-r--r--recipes/wireshark/wireshark_1.2.6.bb4
2 files changed, 6 insertions, 6 deletions
diff --git a/recipes/wireshark/wireshark.inc b/recipes/wireshark/wireshark.inc
index 3cf0d7329f..4ffe8fa313 100644
--- a/recipes/wireshark/wireshark.inc
+++ b/recipes/wireshark/wireshark.inc
@@ -4,10 +4,10 @@ LICENSE = "GPL"
DEPENDS = "perl-native gnutls libpcap pcre expat glib-2.0 net-snmp"
SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2 \
- file://use-our-lemon.patch;apply=yes \
- file://acinclude-net-snmp-fix.patch;apply=yes \
- file://libtool-fix.patch;apply=yes \
- file://no-host-includes.patch;apply=yes"
+ file://use-our-lemon.patch \
+ file://acinclude-net-snmp-fix.patch \
+ file://libtool-fix.patch \
+ file://no-host-includes.patch"
S=${WORKDIR}/wireshark-${PV}
diff --git a/recipes/wireshark/wireshark_1.2.6.bb b/recipes/wireshark/wireshark_1.2.6.bb
index e3630d6554..610db05e02 100644
--- a/recipes/wireshark/wireshark_1.2.6.bb
+++ b/recipes/wireshark/wireshark_1.2.6.bb
@@ -9,8 +9,8 @@ EXTRA_OECONF = "--enable-usr-local=no --with-pcap=${STAGING_DIR_HOST}${layout_pr
PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/wireshark/wireshark-${PV}.tar.bz2;name=src \
- file://ieee80215.4.patch;apply=yes \
- file://fix-configure.patch;apply=yes "
+ file://ieee80215.4.patch \
+ file://fix-configure.patch "
SRC_URI[src.md5sum] = "f3e0917ed393366bbf96c53b58cb0931"
SRC_URI[src.sha256sum]= "72c8178dd0614d963173d667d5ecb39bc7102453ea09da7ef3302daee7733f3c"