summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-09-07 21:27:53 +0000
committerRod Whitby <rod@whitby.id.au>2007-09-07 21:27:53 +0000
commit25eeb065fb156d376960420f1ea7879f3a2880ee (patch)
tree8df0a58a51d04907dfe964dde36b0f555c87cd5b
parent192c2604585e38edd32a51432bbe6ae16a31cc00 (diff)
parent8a00555b71e47ee86e8449a8f44b7e16c3cef1ae (diff)
merge of '5198d0edcd376472b37b08e632a08466f101c570'
and '83398e1336b5456cc5a8661377b3819a02cc3ba2'
-rw-r--r--classes/base.bbclass4
-rw-r--r--packages/tcpdump/tcpdump_3.9.7.bb (renamed from packages/tcpdump/tcpdump_3.9.3.bb)3
2 files changed, 3 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index d4b327e266..999d409914 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -487,9 +487,9 @@ python base_do_fetch() {
try:
if not base_chk_file(parser, pn, pv,uri, localpath, d):
if type != "file":
- bb.note("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+ bb.note("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri))
else:
- bb.debug("%s-%s-%s has no section, not checking URI" % (pn,pv,uri))
+ bb.debug("%s-%s: %s has no entry in conf/checksums.ini, not checking URI" % (pn,pv,uri))
except Exception:
raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
}
diff --git a/packages/tcpdump/tcpdump_3.9.3.bb b/packages/tcpdump/tcpdump_3.9.7.bb
index 7ffcc9a37f..ba9710d86a 100644
--- a/packages/tcpdump/tcpdump_3.9.3.bb
+++ b/packages/tcpdump/tcpdump_3.9.7.bb
@@ -3,8 +3,7 @@ HOMEPAGE = "http://www.tcpdump.org/"
LICENSE = "BSD"
SECTION = "console/network"
PRIORITY = "optional"
-DEPENDS = "libpcap-0.9.3"
-PR = "r2"
+DEPENDS = "libpcap"
SRC_URI = "http://www.tcpdump.org/release/tcpdump-${PV}.tar.gz \
file://tcpdump_configure_no_-O2.patch;patch=1"