Skip to contentSkip to conversation

libpcap.inc: remove obsolete libnl1 PACKAGECONFIG

PATCH New Andre McCurdy 1 participant 2 messages Apr 6, 2015

lore
Share & tools
lore

Andre McCurdy

author
#0 lore raw

PATCH 1/2 libpcap.inc: remove obsolete libnl1 PACKAGECONFIG

There's no libnl1 recipe in oe-core (or any other layer in the layer index).

Keeping the libnl1 PACKAGECONFIG is likely to cause problems for the libnl PACKAGECONFIG since libnl and libnl1 both use --with-libnl and --without-libnl.

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-connectivity/libpcap/libpcap.inc | 1 -
 1 file changed, 1 deletion(-)
meta/recipes-connectivity/libpcap/libpcap.inc +0 -1
index 0c608b5..6f2c985 100644
@@ -28,7 +28,6 @@ inherit autotools binconfig-disabled
 EXTRA_OECONF = "--with-pcap=linux"
 
 PACKAGECONFIG ??= ""
-PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 
 CPPFLAGS_prepend = "-I${S} "
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 2/2 libpcap.inc: consolidate inherit and PACKAGECONFIG lines

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-connectivity/libpcap/libpcap.inc | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
meta/recipes-connectivity/libpcap/libpcap.inc +5 -9
index 6f2c985..9b059d7 100644
@@ -10,25 +10,21 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
                     file://pcap.h;beginline=1;endline=32;md5=39af3510e011f34b8872f120b1dc31d2"
 DEPENDS = "flex-native bison-native"
 
-inherit bluetooth pkgconfig
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
-PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
-PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
-PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
-
 INC_PR = "r5"
 
 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz"
 
 BINCONFIG = "${bindir}/pcap-config"
 
-inherit autotools binconfig-disabled
+inherit autotools binconfig-disabled pkgconfig bluetooth
 
 EXTRA_OECONF = "--with-pcap=linux"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
+PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"
 
 CPPFLAGS_prepend = "-I${S} "
 CFLAGS_prepend = "-I${S} "
Signature · 1 line
1.9.1