diff options
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch | 24 | ||||
| -rw-r--r-- | meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb (renamed from meta/recipes-connectivity/libpcap/libpcap_1.5.3.bb) | 8 |
3 files changed, 5 insertions, 31 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 92d6eff628..a12eb16615 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc @@ -7,7 +7,7 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=53067&atid=469577" SECTION = "libs/network" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \ - file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" + file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2" DEPENDS = "flex-native bison-native" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" @@ -17,7 +17,7 @@ PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl" INC_PR = "r5" -SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" +SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz" BINCONFIG = "${bindir}/pcap-config" diff --git a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch deleted file mode 100644 index 2f5cd213bc..0000000000 --- a/meta/recipes-connectivity/libpcap/libpcap/ieee80215-arphrd.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream-Status: Pending - -Index: libpcap-1.0.0/pcap-linux.c -=================================================================== ---- libpcap-1.0.0.orig/pcap-linux.c 2009-01-28 11:58:54.000000000 +0300 -+++ libpcap-1.0.0/pcap-linux.c 2009-01-28 11:59:04.000000000 +0300 -@@ -1616,6 +1616,17 @@ - * so let's use "Linux-cooked" mode. Jean II */ - //handle->md.cooked = 1; - break; -+#ifndef ARPHRD_IEEE80215 -+#define ARPHRD_IEEE80215 805 -+#endif -+#ifndef ARPHRD_IEEE80215_PHY -+#define ARPHRD_IEEE80215_PHY 806 -+#endif -+ -+ case ARPHRD_IEEE80215: -+ case ARPHRD_IEEE80215_PHY: -+ handle->linktype = DLT_IEEE802_15_4; -+ break; - - /* ARPHRD_LAPD is unofficial and randomly allocated, if reallocation - * is needed, please report it to <daniele@orlandi.com> */ diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.5.3.bb b/meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb index 3ba3caa3bc..f570ebba95 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.5.3.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.6.1.bb @@ -1,10 +1,8 @@ require libpcap.inc -SRC_URI += "file://aclocal.patch \ - file://ieee80215-arphrd.patch \ - " -SRC_URI[md5sum] = "7e7321fb3aff2f2bb05c8229f3795d4a" -SRC_URI[sha256sum] = "9ae92159c1060f15e6a90f2c4ad227268b6aaa382c316fa49a31c496b9979e93" +SRC_URI += "file://aclocal.patch" +SRC_URI[md5sum] = "5eb05edf6b6c6e63d536d1c9fbfb2f7c" +SRC_URI[sha256sum] = "116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476" # # make install doesn't cover the shared lib |