[oe-commits] org.oe.dev merge of '5198d0edcd376472b37b08e632a08466f101c570'

[rwhitby commit]

merge of '5198d0edcd376472b37b08e632a08466f101c570'
     and '83398e1336b5456cc5a8661377b3819a02cc3ba2'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 965f72e4cde00c3f4d4826ce609b171e77b92e00
ViewMTN: http://monotone.openembedded.org/revision/info/965f72e4cde00c3f4d4826ce609b171e77b92e00
Files:
1
packages/tcpdump/tcpdump_3.9.3.bb
packages/tcpdump/tcpdump_3.9.7.bb
classes/base.bbclass
Diffs:

#
# mt diff -r5198d0edcd376472b37b08e632a08466f101c570 -r965f72e4cde00c3f4d4826ce609b171e77b92e00
#
# 
# 
# rename "packages/tcpdump/tcpdump_3.9.3.bb"
#     to "packages/tcpdump/tcpdump_3.9.7.bb"
# 
# patch "classes/base.bbclass"
#  from [c46582cf3af337f4c4c1769a3cc4f456f429f294]
#    to [7a3b6633b42df8f8bc1dfd4e57a66773f8d0cde3]
# 
# patch "packages/tcpdump/tcpdump_3.9.7.bb"
#  from [6155511c925cd01881357a3d5f6729dfd24254fd]
#    to [de2e8ad319450b0714e8ca594e5aad8768645f99]
# 
============================================================
--- classes/base.bbclass	c46582cf3af337f4c4c1769a3cc4f456f429f294
+++ classes/base.bbclass	7a3b6633b42df8f8bc1dfd4e57a66773f8d0cde3
@@ -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)
 }
============================================================
--- packages/tcpdump/tcpdump_3.9.3.bb	6155511c925cd01881357a3d5f6729dfd24254fd
+++ packages/tcpdump/tcpdump_3.9.7.bb	de2e8ad319450b0714e8ca594e5aad8768645f99
@@ -1,10 +1,9 @@ PRIORITY = "optional"
 DESCRIPTION = "A sophisticated network protocol analyzer"
 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"


#
# mt diff -r83398e1336b5456cc5a8661377b3819a02cc3ba2 -r965f72e4cde00c3f4d4826ce609b171e77b92e00
#
# 
# no changes
#