Skip to contentSkip to conversation

dpdk-dev-libibverbs: fix do_fetch failure in case of multilib

PATCH In review Chen Qi 1 participant 4 messages Dec 25, 2017

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/3 dpdk-dev-libibverbs: fix do_fetch failure in case of multilib

Fix to correctly set SRC_URI and S to avoid do_fetch failure in case of multilib.

Signed-off-by Chen Qi <[email protected]>
---
 .../dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb +4 -4
index e40c63b..2313f73 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Mellanox/dpdk-dev-libibverbs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM =  "file://COPYING;md5=7c557f27dd795ba77cc419dddc656b51"
 
-SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz;name=${PN} \
+SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz \
            file://init_c.patch \
            file://0001-Fix-build-with-clang.patch \
            file://0002-typecast-enum-to-int-before-comparison.patch \

@@ -11,8 +11,8 @@ SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${
            file://0004-Fix-clang-warnings.patch \
            "
 
-SRC_URI[dpdk-dev-libibverbs.md5sum] = "65234ee278eb437a7069326f37cd4d86"
-SRC_URI[dpdk-dev-libibverbs.sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd"
+SRC_URI[md5sum] = "65234ee278eb437a7069326f37cd4d86"
+SRC_URI[sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd"
 
 # A machine needs to enable this using:
 # COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "<machine name>"

@@ -20,7 +20,7 @@ SRC_URI[dpdk-dev-libibverbs.sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248
 COMPATIBLE_MACHINE = "null"
 COMPATIBLE_HOST_libc-musl_class-target = "null"
 
-S = "${WORKDIR}/${PN}-libibverbs-${PV}"
+S = "${WORKDIR}/libibverbs-${PV}"
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 DEPENDS = "libnl"
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/3 dpdk-dev-libibverbs: provide virtual/libibverbs

dpdk-dev-libibverbs is not the only recipe that provides libibverbs. In meta-cloud-services, we have a recipe called libibverbs. As both recipes provide the same library, we need to avoid building both at the same time at one build.

Use 'virtual/libibverbs' to avoid such problem.

Signed-off-by Chen Qi <[email protected]>
---
 .../dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb       | 3 +++
 1 file changed, 3 insertions(+)
recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb +3 -0
index 2313f73..070c952 100644
@@ -24,4 +24,7 @@ S = "${WORKDIR}/libibverbs-${PV}"
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 DEPENDS = "libnl"
 
+PROVIDES = "virtual/libibverbs"
+RPROVIDES_${PN} = "virtual/libibverbs"
+
 inherit pkgconfig autotools
Signature · 1 line
2.11.0
author
#2 lore raw

PATCH 3/3 dpdk: use virtual/libibverbs

In reply to Chen Qi

We have multiple recipes in different layers providing the same libibverbs library, so we need to use virtual/libibverbs to avoid potential errors.

Make dpdk depend on virtual/libibverbs instead of hardcoding dpdk-dev-libibverbs.

Signed-off-by Chen Qi <[email protected]>
---
 recipes-extended/dpdk/dpdk.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-extended/dpdk/dpdk.inc +2 -2
index c1d0149..216293c 100644
@@ -33,8 +33,8 @@ export CONFIG_EXAMPLE_DPDK_QAT = "${@bb.utils.contains('PACKAGECONFIG', 'dpdk_qa
 export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', 'libvirt', 'y', 'n', d)}"
 export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}"
 
-RDEPENDS_${PN} += "python-subprocess dpdk-dev-libibverbs"
-DEPENDS = "virtual/kernel dpdk-dev-libibverbs"
+RDEPENDS_${PN} += "python-subprocess virtual/libibverbs"
+DEPENDS = "virtual/kernel virtual/libibverbs"
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 
 inherit module
Signature · 1 line
2.11.0
author
#3 lore raw
In reply to Chen Qi

Hi All,

Sorry for the noise.
This patchset has a problem.

I'll send out a new series ASAP.

Best Regards,
Chen Qi

Quoted 40 lines · Chen Qi

Fix to correctly set SRC_URI and S to avoid do_fetch failure in case of multilib.

Signed-off-by Chen Qi <[email protected]>
---
  .../dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb  | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb +4 -4
index e40c63b..2313f73 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Mellanox/dpdk-dev-libibverbs"
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM =  "file://COPYING;md5=7c557f27dd795ba77cc419dddc656b51"
 
-SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz;name=${PN} \
+SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${PV}.tar.gz \
             file://init_c.patch \
             file://0001-Fix-build-with-clang.patch \
             file://0002-typecast-enum-to-int-before-comparison.patch \

@@ -11,8 +11,8 @@ SRC_URI = "https://github.com/Mellanox/dpdk-dev-libibverbs/archive/libibverbs-${
             file://0004-Fix-clang-warnings.patch \
             "
 
-SRC_URI[dpdk-dev-libibverbs.md5sum] = "65234ee278eb437a7069326f37cd4d86"
-SRC_URI[dpdk-dev-libibverbs.sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd"
+SRC_URI[md5sum] = "65234ee278eb437a7069326f37cd4d86"
+SRC_URI[sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd"
 
  # A machine needs to enable this using:
  # COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "<machine name>"

@@ -20,7 +20,7 @@ SRC_URI[dpdk-dev-libibverbs.sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248
  COMPATIBLE_MACHINE = "null"
  COMPATIBLE_HOST_libc-musl_class-target = "null"
 
-S = "${WORKDIR}/${PN}-libibverbs-${PV}"
+S = "${WORKDIR}/libibverbs-${PV}"
  COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
  DEPENDS = "libnl"