[PATCH 0/2] [meta-networking] Fixes for corosync and net-snmp

[PATCH 0/2] [meta-networking] Fixes for corosync and net-snmp

[Robert Yang]

The following changes since commit 41fe46157ca3caa96408a9a749d62c8bbc3c2794:

  python-paste: upgrade 3.2.0 -> 3.2.1 (2019-09-25 22:51:10 -0700)

are available in the git repository at:

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

Robert Yang (2):
  corosync: Fix PACKAGECONFIG flag for rdma
  net-snmp: Fix PACKAGECONFIG for perl

 meta-networking/recipes-extended/corosync/corosync_2.4.4.bb | 2 +-
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.7.4

[PATCH 0/2][meta-networking] Fixes for corosync and net-snmp

[Robert Yang]

The following changes since commit 41fe46157ca3caa96408a9a749d62c8bbc3c2794:

  python-paste: upgrade 3.2.0 -> 3.2.1 (2019-09-25 22:51:10 -0700)

are available in the git repository at:

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

Robert Yang (2):
  corosync: Fix PACKAGECONFIG flag for rdma
  net-snmp: Fix PACKAGECONFIG for perl

 meta-networking/recipes-extended/corosync/corosync_2.4.4.bb | 2 +-
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

-- 
2.7.4

[PATCH 1/2] corosync: Fix PACKAGECONFIG flag for rdma

[Robert Yang]

Fixed:
PACKAGECONFIG_append_pn-corosync = ' rdma'

$ bitbake corosync
| configure: error: Package requirements (rdmacm) were not met:
|
| No package 'rdmacm' found

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-networking/recipes-extended/corosync/corosync_2.4.4.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb
index 23a3d14..e2ab25b 100644
--- a/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb
+++ b/meta-networking/recipes-extended/corosync/corosync_2.4.4.bb
@@ -36,7 +36,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus"
 PACKAGECONFIG[qdevice] = "--enable-qdevices,--disable-qdevices"
 PACKAGECONFIG[qnetd] = "--enable-qnetd,--disable-qnetd"
-PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma"
+PACKAGECONFIG[rdma] = "--enable-rdma,--disable-rdma,librdmacm"
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
 PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_system_unitdir},--disable-systemd --without-systemddir,systemd"
 
-- 
2.7.4

[PATCH 2/2] net-snmp: Fix PACKAGECONFIG for perl

[Robert Yang]

* Remove perl-lib since it had been removed by oe-core:
  commit 68552c353255188de3d5b42135360a30e7eac535
  Author: Alexander Kanavin <alex.kanavin@gmail.com>
  Date:   Sun Dec 2 12:46:37 2018 +0100

      perl: remove the previous version of the recipe

  Now the files are in perl pacakge.

* Fix perl paths when perl is enabled.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
index 60b2b38..192b6b5 100644
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
+++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.8.bb
@@ -50,7 +50,7 @@ PACKAGECONFIG[libnl] = "--with-nl, --without-nl, libnl"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,,"
 
 PACKAGECONFIG[perl] = "--enable-embedded-perl --with-perl-modules=yes, --disable-embedded-perl --with-perl-modules=no,\
-                       perl, perl perl-lib"
+                       perl,"
 PACKAGECONFIG[des] = "--enable-des,--disable-des"
 
 EXTRA_OECONF = "--enable-shared \
@@ -88,8 +88,8 @@ do_configure_prepend() {
 
     if [ "${HAS_PERL}" = "1" ]; then
         # this may need to be changed when package perl has any change.
-        cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config.pm ${WORKDIR}/
-        cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl/*/Config_heavy.pl ${WORKDIR}/
+        cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/Config.pm ${WORKDIR}/
+        cp -f ${STAGING_DIR_TARGET}/usr/lib*/perl?/*/*/Config_heavy.pl ${WORKDIR}/
         sed -e "s@libpth => '/usr/lib.*@libpth => '${STAGING_DIR_TARGET}/${libdir} ${STAGING_DIR_TARGET}/${base_libdir}',@g" \
             -e "s@privlibexp => '/usr@privlibexp => '${STAGING_DIR_TARGET}/usr@g" \
             -e "s@scriptdir => '/usr@scriptdir => '${STAGING_DIR_TARGET}/usr@g" \
@@ -190,7 +190,8 @@ ALLOW_EMPTY_${PN} = "1"
 ALLOW_EMPTY_${PN}-server = "1"
 ALLOW_EMPTY_${PN}-libs = "1"
 
-FILES_${PN}-perl-modules = "${libdir}/perl/*"
+FILES_${PN}-perl-modules = "${libdir}/perl?/*"
+RDEPENDS_${PN}-perl-modules = "perl"
 
 FILES_${PN}-libs = ""
 FILES_${PN}-mibs = "${datadir}/snmp/mibs"
-- 
2.7.4