Fixes for PACKAGECONFIG

The following changes since commit 7f85e74d5c53b34e5f470967fdbdbd19fed1929a:

sysvinit: Only enable recipe in builds where its applicable (2015-06-10 12:03:14 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/pkgconfig
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/pkgconfig

Robert Yang (3):
base.class: warn for invalid PACKAGECONFIG
bluez5: remove alsa from PACKAGECONFIG
libpcap: fix PACKAGECONFIG

 meta/classes/base.bbclass                     |    5 +++++
 meta/recipes-connectivity/bluez5/bluez5.inc   |    2 +-
 meta/recipes-connectivity/libpcap/libpcap.inc |    2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

1.7.9.5

There may be typos or out of date values in PACKAGECONFIG, check and warn them.

---
 meta/classes/base.bbclass |    5 +++++
 1 file changed, 5 insertions(+)

index 8637f9f..46762d9 100644
@@ -341,6 +341,11 @@ python () {
     if pkgconfigflags:
         pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
         pn = d.getVar("PN", True)
+
+        for pconfig in pkgconfig:
+            if pconfig not in pkgconfigflags:
+                bb.warn("%s: invalid PACKAGECONFIG: %s" % (pn, pconfig))
+
         mlprefix = d.getVar("MLPREFIX", True)
 
         def expandFilter(appends, extension, prefix):

1.7.9.5

The PACKAGECONFIG[alsa] had been removed when upgraded to 5.12 since it was not supported any more.

---
 meta/recipes-connectivity/bluez5/bluez5.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 67aafbb..ae9402f 100644
@@ -12,7 +12,7 @@ RPROVIDES_${PN} += "bluez-hcidump"
 
 RCONFLICTS_${PN} = "bluez4"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
+PACKAGECONFIG ??= "obex-profiles"
 PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
 PACKAGECONFIG[experimental] = "--enable-experimental,--disable-experimental,"
 

1.7.9.5

The BLUEZ is default to bluez5, but there is only PACKAGECONFIG[bluez4], no PACKAGECONFIG[bluez5], and the current version of libpcap (or the higher version 1.7.3) only supports bluez4, we can't use ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} for PACKAGECONFIG any more since BLUEZ is default to bluez5, and not supported, and there is no bluez4 in oe-core any more, set PACKAGECONFIG to "" by default, other layers where bluez4 is available can enable it via bbappend.

---
 meta/recipes-connectivity/libpcap/libpcap.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 9b059d7..b7c3995 100644
@@ -20,7 +20,7 @@ inherit autotools binconfig-disabled pkgconfig bluetooth
 
 EXTRA_OECONF = "--with-pcap=linux"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}"
+PACKAGECONFIG ??= ""
 PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
 PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"

1.7.9.5

So the point of this logic is that simply removing bluez5 from DISTRO_FEATURES results in bluez4 being enabled where relevant, which you're removing.

Would a better fix would be to have a dummy (empty) bluez5 stanza?

Ross

Hi Ross,

The code was:
PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)}" PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"

BLUEZ is default to bluez5, did you mean that we add a line like:
PACKAGECONFIG[bluez5] = ",,"
or
PACKAGECONFIG[bluez5] = ",--disable-bluetooth,"

But we didn't need such a line, since when PACKAGECONFIG != bluez4, the --disable-bluetooth will be used.

Maybe we can simply drop this patch ? I made this patch to avoid confusing the user.

// Robert

Hi Ross,

After more thoughts, add a dummy PACKAGECONFIG can avoid confusing the user, and avoid the warning, so I updated in the repo:

git://git.openembedded.org/openembedded-core-contrib rbt/pkgconfig

The BLUEZ is default to bluez5, but there is only PACKAGECONFIG[bluez4], no PACKAGECONFIG[bluez5], add a dummy PACKAGECONFIG for bluez5 to avoid confusing the user, and avoid the warning.

---
 meta/recipes-connectivity/libpcap/libpcap.inc |    2 ++
 1 file changed, 2 insertions(+)

index 9b059d7..0873c24 100644
@@ -22,6 +22,8 @@ EXTRA_OECONF = "--with-pcap=linux"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 

'${BLUEZ}', '', d)}"
PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
+# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. +PACKAGECONFIG[bluez5] = ",,"
PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" PACKAGECONFIG[libnl] = "--with-libnl,--without-libnl,libnl"

// Robert

Yes, that's what I meant - thanks.

Ross