summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/libpcap
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2011-12-23 06:27:24 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:14:23 (GMT)
commit1d5f9896d19716ccdd9d412502d90bb804059317 (patch)
tree15ae8f5444df8a4b5914d78062f3158f8fd06fce /meta/recipes-connectivity/libpcap
parent940c1ad0581e03b479b956261904368b9af4fd5f (diff)
downloadpoky-1d5f9896d19716ccdd9d412502d90bb804059317.tar.gz
libpcap: upgrade to 1.2.0
This patch is to upgrade libpcap to 1.2.0. The values of the macro definitions are duplicated with the new code, so change them into other values. (From OE-Core rev: 2a76f0731f5e2ad4b941197bdf59c66d52ec9131) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/libpcap')
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.2.0/aclocal.patch (renamed from meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch)0
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap-1.2.0/ieee80215-arphrd.patch (renamed from meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch)4
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc2
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap_1.2.0.bb (renamed from meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb)4
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch b/meta/recipes-connectivity/libpcap/libpcap-1.2.0/aclocal.patch
index 469d122..469d122 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/aclocal.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.2.0/aclocal.patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch b/meta/recipes-connectivity/libpcap/libpcap-1.2.0/ieee80215-arphrd.patch
index 8041d7a..2f5cd21 100644
--- a/meta/recipes-connectivity/libpcap/libpcap-1.1.1/ieee80215-arphrd.patch
+++ b/meta/recipes-connectivity/libpcap/libpcap-1.2.0/ieee80215-arphrd.patch
@@ -9,10 +9,10 @@ Index: libpcap-1.0.0/pcap-linux.c
9 //handle->md.cooked = 1; 9 //handle->md.cooked = 1;
10 break; 10 break;
11+#ifndef ARPHRD_IEEE80215 11+#ifndef ARPHRD_IEEE80215
12+#define ARPHRD_IEEE80215 804 12+#define ARPHRD_IEEE80215 805
13+#endif 13+#endif
14+#ifndef ARPHRD_IEEE80215_PHY 14+#ifndef ARPHRD_IEEE80215_PHY
15+#define ARPHRD_IEEE80215_PHY 805 15+#define ARPHRD_IEEE80215_PHY 806
16+#endif 16+#endif
17+ 17+
18+ case ARPHRD_IEEE80215: 18+ case ARPHRD_IEEE80215:
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 84001e5..6051bbc 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" 10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
11DEPENDS = "flex-native bison-native" 11DEPENDS = "flex-native bison-native"
12 12
13INC_PR = "r1" 13INC_PR = "r0"
14 14
15SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" 15SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
16 16
diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.2.0.bb
index 2700bb7..bc7c03b 100644
--- a/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb
+++ b/meta/recipes-connectivity/libpcap/libpcap_1.2.0.bb
@@ -5,8 +5,8 @@ PR = "${INC_PR}.0"
5SRC_URI += "file://aclocal.patch \ 5SRC_URI += "file://aclocal.patch \
6 file://ieee80215-arphrd.patch" 6 file://ieee80215-arphrd.patch"
7 7
8SRC_URI[md5sum] = "1bca27d206970badae248cfa471bbb47" 8SRC_URI[md5sum] = "dfb8aa690b7a29821bfa183025436569"
9SRC_URI[sha256sum] = "508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85" 9SRC_URI[sha256sum] = "702ac51cfaa5c17d6b92771b22835d58eda4dc9e1f596c80a0b031e4c45c07d6"
10 10
11# 11#
12# make install doesn't cover the shared lib 12# make install doesn't cover the shared lib