| Submitter | Jan Luebbe |
|---|---|
| Date | Nov. 16, 2011, 10:05 p.m. |
| Message ID | <1321481130-14072-1-git-send-email-jluebbe@debian.org> |
| Download | mbox | patch |
| Permalink | /patch/15063/ |
| State | Accepted |
| Commit | 942cdda2194078755a11efef3ba3f502f72e4f5e |
| Headers | show |
Comments
On Wed, 2011-11-16 at 23:05 +0100, Jan Luebbe wrote: > This fixes building of tcpdump on hosts where libpcap-dev is installed. > Also introduce INC_PR. > > Signed-off-by: Jan Luebbe <jluebbe@debian.org> > --- > meta/recipes-connectivity/libpcap/libpcap.inc | 4 +++- > meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb | 2 +- > 2 files changed, 4 insertions(+), 2 deletions(-) Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 2737dbe..84001e5 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc @@ -10,9 +10,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \ file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" DEPENDS = "flex-native bison-native" +INC_PR = "r1" + SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz" -inherit autotools +inherit autotools binconfig EXTRA_OECONF = "--with-pcap=linux" diff --git a/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb b/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb index de04290..2700bb7 100644 --- a/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb +++ b/meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb @@ -1,6 +1,6 @@ require libpcap.inc -PR = "r0" +PR = "${INC_PR}.0" SRC_URI += "file://aclocal.patch \ file://ieee80215-arphrd.patch"
This fixes building of tcpdump on hosts where libpcap-dev is installed. Also introduce INC_PR. Signed-off-by: Jan Luebbe <jluebbe@debian.org> --- meta/recipes-connectivity/libpcap/libpcap.inc | 4 +++- meta/recipes-connectivity/libpcap/libpcap_1.1.1.bb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)