From patchwork Mon Sep 10 20:04:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 44546 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B72425F1F; Mon, 10 Sep 2018 22:05:02 +0200 (CEST) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by dpdk.org (Postfix) with ESMTP id 2EF6B5F28 for ; Mon, 10 Sep 2018 22:05:01 +0200 (CEST) Received: by mail-wm0-f65.google.com with SMTP id t25-v6so22672022wmi.3 for ; Mon, 10 Sep 2018 13:05:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PSBA1oTeI9juL56QlZ5eG8sOdLUGDzoZn1QsBDPQd2E=; b=AToNTAspEs9kt5GZRl/BpphwD8/cxA37ENzUUmX/mG7H0Wjp4p1h39pdDEkHJFbp96 +lj617b2GDXnHHmbyTgVo4dFUr/SxhscRjMUeKxasSj7BrBqRFVodCa0TKKiufpdcaUJ 7EDelzVsFl7fdYQwIpiOeU47wlQnaici4uNq1Ak4z3Gy1ExRYZMBL7OIq1j6Nu5+7iC4 rjip4Avk3gZd6P1jGGsWNL2F5qP8nvQqXdooRccIhXgyMgnNO7wSGFT/sqH+r9818oNj 1zFGTzjEcvqgRmGya0K3UkiJisaSTPaz1Y0HvWDsUU25CD2pRJpJKzmN4TzzQrAkAIwL 2W8w== X-Gm-Message-State: APzg51DLagwyzoiZl2GGQgFOrcCQ7dHoQ/7++OMVQEALZyvLxoPR+hQ2 VdF5YlmSUJjLxP+foj2mBpeYI6RoQEw= X-Google-Smtp-Source: ANB0VdYEMAf8bITe00bA9Hn0HlDwPxkZZqFdZnkpzJXzYk32I4BFmJMHjaT1DojTbEyzslxJxsm4xQ== X-Received: by 2002:a1c:8291:: with SMTP id e139-v6mr1908440wmd.39.1536609900633; Mon, 10 Sep 2018 13:05:00 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id f18-v6sm17274930wrw.32.2018.09.10.13.04.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Sep 2018 13:04:58 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: keith.wiles@intel.com, roy.fan.zhang@intel.com, jingjing.wu@intel.com, wenzhuo.lu@intel.com, rasesh.mody@cavium.com, harish.patil@cavium.com, shahed.shaikh@cavium.com, amr.mokhtar@intel.com, shijith.thotton@cavium.com, ssrinivasan@cavium.com, liang.j.ma@intel.com, peter.mccarthy@intel.com, jerin.jacob@caviumnetworks.com, maciej.czekaj@caviumnetworks.com, arybchenko@solarflare.com, antosh.shukla@caviumnetworks.com, ashish.gupta@cavium.com, yongwang@vmware.com, bruce.richardson@intel.com, thomas@monjalon.net Date: Mon, 10 Sep 2018 21:04:12 +0100 Message-Id: <20180910200415.8340-13-bluca@debian.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180910200415.8340-1-bluca@debian.org> References: <20180910200415.8340-1-bluca@debian.org> Subject: [dpdk-dev] [PATCH 12/15] event/octeontx: rename version map after library file name X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The library is called librte_pmd_octeonx_ssovf, so rename the map file and set the name in the meson file so that the built library names with meson and legacy makefiles are the same. Also refactor how the event PMDs library names are built in Meson to allow for this discrepancy in the octeonx driver (all other PMDs are called FOO_event, while this is called octeonx_ssovf) Fixes: bd77f2d64c44 ("event/octeontx: build with meson") Cc: stable@dpdk.org Signed-off-by: Luca Boccassi --- drivers/event/dpaa/meson.build | 1 + drivers/event/dpaa2/meson.build | 1 + drivers/event/meson.build | 2 +- drivers/event/octeontx/Makefile | 2 +- drivers/event/octeontx/meson.build | 1 + ...ntx_event_version.map => rte_pmd_octeontx_ssovf_version.map} | 0 drivers/event/opdl/meson.build | 1 + drivers/event/skeleton/meson.build | 1 + drivers/event/sw/meson.build | 1 + 9 files changed, 8 insertions(+), 2 deletions(-) rename drivers/event/octeontx/{rte_pmd_octeontx_event_version.map => rte_pmd_octeontx_ssovf_version.map} (100%) diff --git a/drivers/event/dpaa/meson.build b/drivers/event/dpaa/meson.build index 0914f858ef..da65aee179 100644 --- a/drivers/event/dpaa/meson.build +++ b/drivers/event/dpaa/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +name = 'dpaa_event' if host_machine.system() != 'linux' build = false endif diff --git a/drivers/event/dpaa2/meson.build b/drivers/event/dpaa2/meson.build index de7a461553..dd38643811 100644 --- a/drivers/event/dpaa2/meson.build +++ b/drivers/event/dpaa2/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 NXP +name = 'dpaa2_event' if host_machine.system() != 'linux' build = false endif diff --git a/drivers/event/meson.build b/drivers/event/meson.build index ed56d20062..245a98ec93 100644 --- a/drivers/event/meson.build +++ b/drivers/event/meson.build @@ -4,4 +4,4 @@ drivers = ['dpaa', 'dpaa2', 'octeontx', 'opdl', 'skeleton', 'sw'] std_deps = ['eventdev', 'kvargs'] config_flag_fmt = 'RTE_LIBRTE_@0@_EVENTDEV_PMD' -driver_name_fmt = 'rte_pmd_@0@_event' +driver_name_fmt = 'rte_pmd_@0@' diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile index 90ad2217f3..6aeaa2bb9d 100644 --- a/drivers/event/octeontx/Makefile +++ b/drivers/event/octeontx/Makefile @@ -19,7 +19,7 @@ LDLIBS += -lrte_eal -lrte_eventdev -lrte_common_octeontx -lrte_pmd_octeontx LDLIBS += -lrte_bus_pci -lrte_mempool -lrte_mbuf -lrte_kvargs LDLIBS += -lrte_bus_vdev -EXPORT_MAP := rte_pmd_octeontx_event_version.map +EXPORT_MAP := rte_pmd_octeontx_ssovf_version.map LIBABIVER := 1 diff --git a/drivers/event/octeontx/meson.build b/drivers/event/octeontx/meson.build index 0418553308..48b3ffea52 100644 --- a/drivers/event/octeontx/meson.build +++ b/drivers/event/octeontx/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Cavium, Inc +name = 'octeontx_ssovf' sources = files('ssovf_worker.c', 'ssovf_evdev.c', 'ssovf_evdev_selftest.c', diff --git a/drivers/event/octeontx/rte_pmd_octeontx_event_version.map b/drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map similarity index 100% rename from drivers/event/octeontx/rte_pmd_octeontx_event_version.map rename to drivers/event/octeontx/rte_pmd_octeontx_ssovf_version.map diff --git a/drivers/event/opdl/meson.build b/drivers/event/opdl/meson.build index cc6029c6f0..6083a7e78a 100644 --- a/drivers/event/opdl/meson.build +++ b/drivers/event/opdl/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Luca Boccassi +name = 'opdl_event' sources = files( 'opdl_evdev.c', 'opdl_evdev_init.c', diff --git a/drivers/event/skeleton/meson.build b/drivers/event/skeleton/meson.build index acfe156532..0995cf50cb 100644 --- a/drivers/event/skeleton/meson.build +++ b/drivers/event/skeleton/meson.build @@ -1,5 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +name = 'skeleton_event' sources = files('skeleton_eventdev.c') deps += ['bus_pci', 'bus_vdev'] diff --git a/drivers/event/sw/meson.build b/drivers/event/sw/meson.build index 30d2216476..9dd55743aa 100644 --- a/drivers/event/sw/meson.build +++ b/drivers/event/sw/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +name = 'sw_event' allow_experimental_apis = true sources = files('sw_evdev_scheduler.c', 'sw_evdev_selftest.c',