From a3c96e04c7d9ad1a015e227fa376e9066c6552a9 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 6 Sep 2018 12:24:24 +0800 Subject: dpdk-dev-libibverbs: remove The upstream repo has been taken down and the role of libibverbs has been taken over by rdma-core instead [1][2]. [1] https://www.openfabrics.org/downloads/verbs/README.html [2] https://git.kernel.org/pub/scm/libs/infiniband/libibverbs.git/tree/README Signed-off-by: Anuj Mittal --- conf/include/maintainers.inc | 1 - .../dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb | 30 ------ .../files/0001-Fix-build-with-clang.patch | 32 ------ ...02-typecast-enum-to-int-before-comparison.patch | 115 --------------------- .../files/0003-initialize-use_config_mr.patch | 31 ------ .../files/0004-Fix-clang-warnings.patch | 56 ---------- .../dpdk-dev-libibverbs/files/init_c.patch | 23 ----- recipes-extended/dpdk/dpdk.inc | 7 +- 8 files changed, 2 insertions(+), 293 deletions(-) delete mode 100644 recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb delete mode 100644 recipes-extended/dpdk-dev-libibverbs/files/0001-Fix-build-with-clang.patch delete mode 100644 recipes-extended/dpdk-dev-libibverbs/files/0002-typecast-enum-to-int-before-comparison.patch delete mode 100644 recipes-extended/dpdk-dev-libibverbs/files/0003-initialize-use_config_mr.patch delete mode 100644 recipes-extended/dpdk-dev-libibverbs/files/0004-Fix-clang-warnings.patch delete mode 100644 recipes-extended/dpdk-dev-libibverbs/files/init_c.patch diff --git a/conf/include/maintainers.inc b/conf/include/maintainers.inc index b1499f6..a89a54a 100644 --- a/conf/include/maintainers.inc +++ b/conf/include/maintainers.inc @@ -1,4 +1,3 @@ # This file contains a list of recipe maintainers for meta-intel RECIPE_MAINTAINER_pn-dpdk = "TBD DPDK Flex Team" -RECIPE_MAINTAINER_pn-dpdk-dev-libibverbs = "TBD DPDK Flex Team" diff --git a/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb b/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb deleted file mode 100644 index 2a3c64a..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/dpdk-dev-libibverbs_1.2.1-3.4-2.0.0.0.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "libibverbs library to support Mellanox config" -HOMEPAGE = "https://github.com/Mellanox/dpdk-dev-libibverbs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c557f27dd795ba77cc419dddc656b51" - -SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/libibverbs-${PV}.tar.gz \ - file://init_c.patch \ - file://0001-Fix-build-with-clang.patch \ - file://0002-typecast-enum-to-int-before-comparison.patch \ - file://0003-initialize-use_config_mr.patch \ - file://0004-Fix-clang-warnings.patch \ - " - -SRC_URI[md5sum] = "65234ee278eb437a7069326f37cd4d86" -SRC_URI[sha256sum] = "a6471515556cb8d10ad471bb7efb8cf760b248a28aceb57d4534d50d572f56cd" - -# A machine needs to enable this using: -# COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "" - -COMPATIBLE_MACHINE = "null" -COMPATIBLE_HOST_libc-musl_class-target = "null" - -S = "${WORKDIR}/dpdk-dev-libibverbs-libibverbs-${PV}" -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' -DEPENDS = "libnl" - -PROVIDES = "virtual/libibverbs" -RPROVIDES_${PN} = "virtual/libibverbs" - -inherit pkgconfig autotools diff --git a/recipes-extended/dpdk-dev-libibverbs/files/0001-Fix-build-with-clang.patch b/recipes-extended/dpdk-dev-libibverbs/files/0001-Fix-build-with-clang.patch deleted file mode 100644 index 93d8aba..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/files/0001-Fix-build-with-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b705caef6c717adc80585843b7fcc68700ced4b6 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Aug 2017 09:25:24 -0700 -Subject: [PATCH 1/4] Fix build with clang - -Fix -error: logical not is only applied to the left hand side of this bitwise operator [-Werror,-Wlogical-not-parentheses] - if ((!port_attr->comp_mask & IBV_EXP_QUERY_PORT_ATTR_MASK1) || - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - include/infiniband/verbs_exp.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/infiniband/verbs_exp.h b/include/infiniband/verbs_exp.h -index ae94deb..42ed83d 100644 ---- a/include/infiniband/verbs_exp.h -+++ b/include/infiniband/verbs_exp.h -@@ -2955,7 +2955,7 @@ static inline int ibv_exp_query_port(struct ibv_context *context, - &port_attr->port_attr); - - /* Check that only valid flags were given */ -- if ((!port_attr->comp_mask & IBV_EXP_QUERY_PORT_ATTR_MASK1) || -+ if (!(port_attr->comp_mask & IBV_EXP_QUERY_PORT_ATTR_MASK1) || - (port_attr->comp_mask & ~IBV_EXP_QUERY_PORT_ATTR_MASKS) || - (port_attr->mask1 & ~IBV_EXP_QUERY_PORT_MASK)) { - errno = EINVAL; --- -2.14.1 - diff --git a/recipes-extended/dpdk-dev-libibverbs/files/0002-typecast-enum-to-int-before-comparison.patch b/recipes-extended/dpdk-dev-libibverbs/files/0002-typecast-enum-to-int-before-comparison.patch deleted file mode 100644 index 00516eb..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/files/0002-typecast-enum-to-int-before-comparison.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 7edab012f2d28de7e6d3657ec698e1090d0112de Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Aug 2017 09:25:49 -0700 -Subject: [PATCH 2/4] typecast enum to int before comparison - -Fix -error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - examples/cc_pingpong.c | 2 +- - examples/rc_pingpong.c | 2 +- - examples/srq_pingpong.c | 2 +- - examples/task_pingpong.c | 2 +- - examples/uc_pingpong.c | 2 +- - examples/umr_rc.c | 2 +- - examples/xsrq_pingpong.c | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/examples/cc_pingpong.c b/examples/cc_pingpong.c -index 7b3e397..567c503 100644 ---- a/examples/cc_pingpong.c -+++ b/examples/cc_pingpong.c -@@ -1408,7 +1408,7 @@ int main(int argc, char *argv[]) - - case 'm': - mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) { -+ if ((int)mtu < 0) { - usage(argv[0]); - return 1; - } -diff --git a/examples/rc_pingpong.c b/examples/rc_pingpong.c -index 786577e..e661368 100644 ---- a/examples/rc_pingpong.c -+++ b/examples/rc_pingpong.c -@@ -759,7 +759,7 @@ int main(int argc, char *argv[]) - - case 'm': - mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) { -+ if ((int)mtu < 0) { - usage(argv[0]); - return 1; - } -diff --git a/examples/srq_pingpong.c b/examples/srq_pingpong.c -index 9762866..f85a7cd 100644 ---- a/examples/srq_pingpong.c -+++ b/examples/srq_pingpong.c -@@ -697,7 +697,7 @@ int main(int argc, char *argv[]) - - case 'm': - mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) { -+ if ((int)mtu < 0) { - usage(argv[0]); - return 1; - } -diff --git a/examples/task_pingpong.c b/examples/task_pingpong.c -index 748f8bb..d03a8b2 100644 ---- a/examples/task_pingpong.c -+++ b/examples/task_pingpong.c -@@ -1005,7 +1005,7 @@ int main(int argc, char *argv[]) - - case 'm': - mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) { -+ if ((int)mtu < 0) { - usage(argv[0]); - return 1; - } -diff --git a/examples/uc_pingpong.c b/examples/uc_pingpong.c -index 879bd77..a38a054 100644 ---- a/examples/uc_pingpong.c -+++ b/examples/uc_pingpong.c -@@ -606,7 +606,7 @@ int main(int argc, char *argv[]) - - case 'm': - mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) { -+ if ((int)mtu < 0) { - usage(argv[0]); - return 1; - } -diff --git a/examples/umr_rc.c b/examples/umr_rc.c -index ab76d3c..0ec636a 100644 ---- a/examples/umr_rc.c -+++ b/examples/umr_rc.c -@@ -950,7 +950,7 @@ int main(int argc, char *argv[]) - - case 'm': - mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) { -+ if ((int)mtu < 0) { - usage(argv[0]); - return 1; - } -diff --git a/examples/xsrq_pingpong.c b/examples/xsrq_pingpong.c -index c4ae51d..cebae5d 100644 ---- a/examples/xsrq_pingpong.c -+++ b/examples/xsrq_pingpong.c -@@ -910,7 +910,7 @@ int main(int argc, char *argv[]) - break; - case 'm': - ctx.mtu = pp_mtu_to_enum(strtol(optarg, NULL, 0)); -- if (ctx.mtu < 0) { -+ if ((int)ctx.mtu < 0) { - usage(argv[0]); - return 1; - } --- -2.14.1 - diff --git a/recipes-extended/dpdk-dev-libibverbs/files/0003-initialize-use_config_mr.patch b/recipes-extended/dpdk-dev-libibverbs/files/0003-initialize-use_config_mr.patch deleted file mode 100644 index da4ef15..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/files/0003-initialize-use_config_mr.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 936da7fcab06ff3bc7c1c1e1ab108a36797da039 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Aug 2017 09:28:00 -0700 -Subject: [PATCH 3/4] initialize use_config_mr - -Fixes -error: variable 'use_contig_mr' is uninitialized when used here [-Werror,-Wuninitialized] - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - examples/dcini.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/examples/dcini.c b/examples/dcini.c -index 001e905..08d75ec 100644 ---- a/examples/dcini.c -+++ b/examples/dcini.c -@@ -269,7 +269,7 @@ int main(int argc, char *argv[]) - int size = 4096; - int iters = 1000; - int use_event = 0; -- int use_contig_mr; -+ int use_contig_mr = 0; - int err; - struct ibv_ah_attr ah_attr; - struct dc_ctx ctx = { --- -2.14.1 - diff --git a/recipes-extended/dpdk-dev-libibverbs/files/0004-Fix-clang-warnings.patch b/recipes-extended/dpdk-dev-libibverbs/files/0004-Fix-clang-warnings.patch deleted file mode 100644 index 26f09e5..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/files/0004-Fix-clang-warnings.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 08944074f9d9525a57e88a4990dd833d0999b8df Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Aug 2017 09:36:55 -0700 -Subject: [PATCH 4/4] Fix clang warnings - -../../../../../../../workspace/sources/dpdk-dev-libibverbs/examples/intf.c:1221:11: error: comparison of array 'ctx->dev_name' not equal to a null pointer is always true [-Werror,-Wtautological-pointer-compare] - if (ctx->dev_name != NULL) { - ~~~~~^~~~~~~~ ~~~~ -../../../../../../../workspace/sources/dpdk-dev-libibverbs/examples/intf.c:1893:13: error: comparison of unsigned expression < 0 is always false [-Werror,-Wtautological-compare] - if (size < 0 || size > MAX_MSG_SIZE) - ~~~~ ^ ~ -../../../../../../../workspace/sources/dpdk-dev-libibverbs/examples/intf.c:1901:12: error: comparison of unsigned enum expression < 0 is always false [-Werror,-Wtautological-compare] - if (mtu < 0) - ~~~ ^ ~ - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - examples/intf.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/examples/intf.c b/examples/intf.c -index 8d158ee..1f1af50 100644 ---- a/examples/intf.c -+++ b/examples/intf.c -@@ -1218,7 +1218,7 @@ int create_resources(struct intf_context *ctx) - return 1; - } - -- if (!ctx->dev_name) { -+ if (!ctx->dev_name[0]) { - ctx->ib_dev = *dev_list; - if (!ctx->ib_dev) { - fprintf(stderr, "No IB devices found\n"); -@@ -1828,7 +1828,7 @@ int parse_input(struct intf_input *input, struct intf_input *default_input, int - char *ib_devname = NULL; - char *vrbs_intf = NULL; - char *cpus_str = NULL; -- unsigned long long size; -+ long long size; - - memcpy(input, default_input, sizeof(*input)); - -@@ -1898,7 +1898,7 @@ int parse_input(struct intf_input *input, struct intf_input *default_input, int - - case 'm': - mtu = mtu_to_enum(strtol(optarg, NULL, 0)); -- if (mtu < 0) -+ if ((int)mtu < 0) - goto print_usage; - input->ib_data.mtu = mtu; - break; --- -2.14.1 - diff --git a/recipes-extended/dpdk-dev-libibverbs/files/init_c.patch b/recipes-extended/dpdk-dev-libibverbs/files/init_c.patch deleted file mode 100644 index a7708d7..0000000 --- a/recipes-extended/dpdk-dev-libibverbs/files/init_c.patch +++ /dev/null @@ -1,23 +0,0 @@ -dpdk-dev-libibverbs: suppress gcc7 warnings - -We know that format-truncation in init.c is okay. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater - - ---- a/src/init.c -+++ b/src/init.c -@@ -31,6 +31,11 @@ - * SOFTWARE. - */ - -+/* For this file we know we can ignore this warning. */ -+#if __GNUC__ > 6 -+#pragma GCC diagnostic ignored "-Wformat-truncation" -+#endif -+ - #if HAVE_CONFIG_H - # include - #endif /* HAVE_CONFIG_H */ diff --git a/recipes-extended/dpdk/dpdk.inc b/recipes-extended/dpdk/dpdk.inc index 9026dfe..3080946 100644 --- a/recipes-extended/dpdk/dpdk.inc +++ b/recipes-extended/dpdk/dpdk.inc @@ -12,9 +12,6 @@ SRC_URI = "git://dpdk.org/dpdk${STABLE};branch=${BRANCH} \ file://dpdk-17.02-dpdk-fix-installation-warning-and-issue.patch \ " -# A machine needs to enable this using: -# COMPATIBLE_MACHINE_pn-dpdk-dev-libibverbs = "" - COMPATIBLE_MACHINE = "null" COMPATIBLE_HOST_libc-musl_class-target = "null" COMPATIBLE_HOST_linux-gnux32 = "null" @@ -35,8 +32,8 @@ export CONFIG_EXAMPLE_VM_POWER_MANAGER = "${@bb.utils.contains('PACKAGECONFIG', export CONFIG_VHOST_ENABLED = "${@bb.utils.contains('PACKAGECONFIG', 'vhost', 'y', 'n', d)}" export CONFIG_HAVE_NUMA = "${@bb.utils.contains('PACKAGECONFIG', 'numa', 'y', 'n', d)}" -RDEPENDS_${PN} += "python-subprocess virtual/libibverbs" -DEPENDS = "virtual/kernel virtual/libibverbs" +RDEPENDS_${PN} += "python-subprocess" +DEPENDS = "virtual/kernel" do_configure[depends] += "virtual/kernel:do_shared_workdir" inherit module -- cgit v1.2.3-54-g00ecf