diff options
| author | Shane Wang <shane.wang@intel.com> | 2011-12-23 14:27:24 +0800 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-01-02 20:26:23 -0800 |
| commit | 2a76f0731f5e2ad4b941197bdf59c66d52ec9131 (patch) | |
| tree | 5a295631d188234da8cf82a31f4426216d2897e3 | |
| parent | 0695487407d25a8d9d25894b20ca1b19a7f55643 (diff) | |
| download | openembedded-core-2a76f0731f5e2ad4b941197bdf59c66d52ec9131.tar.gz openembedded-core-2a76f0731f5e2ad4b941197bdf59c66d52ec9131.tar.bz2 openembedded-core-2a76f0731f5e2ad4b941197bdf59c66d52ec9131.zip | |
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.
Signed-off-by: Shane Wang <shane.wang@intel.com>
| -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.inc | 2 | ||||
| -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 469d122eeb..469d122eeb 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 8041d7a057..2f5cd213bc 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 //handle->md.cooked = 1; break; +#ifndef ARPHRD_IEEE80215 -+#define ARPHRD_IEEE80215 804 ++#define ARPHRD_IEEE80215 805 +#endif +#ifndef ARPHRD_IEEE80215_PHY -+#define ARPHRD_IEEE80215_PHY 805 ++#define ARPHRD_IEEE80215_PHY 806 +#endif + + case ARPHRD_IEEE80215: diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 84001e5a80..6051bbc474 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 \ file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" DEPENDS = "flex-native bison-native" -INC_PR = "r1" +INC_PR = "r0" SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.2.0.bb index 2700bb7f73..bc7c03b708 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" SRC_URI += "file://aclocal.patch \ file://ieee80215-arphrd.patch" -SRC_URI[md5sum] = "1bca27d206970badae248cfa471bbb47" -SRC_URI[sha256sum] = "508cca15547e55d1318498b838456a21770c450beb2dc7d7d4a96d90816e5a85" +SRC_URI[md5sum] = "dfb8aa690b7a29821bfa183025436569" +SRC_URI[sha256sum] = "702ac51cfaa5c17d6b92771b22835d58eda4dc9e1f596c80a0b031e4c45c07d6" # # make install doesn't cover the shared lib |