From: Luca Boccassi <bluca@debian.org>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, tredaelli@redhat.com,
christian.ehrhardt@canonical.com, mvarlese@suse.de,
Luca Boccassi <bluca@debian.org>
Subject: [dpdk-dev] [PATCH v2 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY
Date: Tue, 2 Oct 2018 14:06:45 +0100 [thread overview]
Message-ID: <20181002130646.14919-1-bluca@debian.org> (raw)
In-Reply-To: <20180928175803.12955-1-bluca@debian.org>
As part of the effort of consolidating the DPDK installation bits and
pieces across distros, set the default directory of lib/ where PMDs get
installed to dpdk/pmds-XX.YY. It's necessary to have a versioned
subdirectory as multiple ABI revisions might be installed at the same
time, so having a fixed name will cause trouble with the autoload
feature.
Small refactor with parsing and saving the major version to a variable,
since it's now used in 3 different places.
Signed-off-by: Luca Boccassi <bluca@debian.org>
---
drivers/meson.build | 6 ++----
lib/meson.build | 6 ++----
meson.build | 8 +++++++-
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index 47b4215a30..3a6c4bf656 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -98,10 +98,8 @@ foreach class:driver_classes
lib_version = '@0@.1'.format(version)
so_version = '@0@'.format(version)
else
- pver = meson.project_version().split('.')
- lib_version = '@0@.@1@'.format(pver.get(0),
- pver.get(1))
- so_version = lib_version
+ lib_version = major_version
+ so_version = major_version
endif
# now build the static driver
diff --git a/lib/meson.build b/lib/meson.build
index 3acc67e6ed..bed492a4ec 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -88,10 +88,8 @@ foreach l:libraries
lib_version = '@0@.1'.format(version)
so_version = '@0@'.format(version)
else
- prj_ver = meson.project_version().split('.')
- lib_version = '@0@.@1@'.format(
- prj_ver.get(0), prj_ver.get(1))
- so_version = lib_version
+ lib_version = major_version
+ so_version = major_version
endif
# first build static lib
diff --git a/meson.build b/meson.build
index c9af33532d..4bd04b9de3 100644
--- a/meson.build
+++ b/meson.build
@@ -15,7 +15,13 @@ dpdk_libraries = []
dpdk_drivers = []
dpdk_extra_ldflags = []
-driver_install_path = join_paths(get_option('libdir'), 'dpdk/drivers')
+# set the major version, which might be used by drivers and libraries
+# depending on the configuration options
+pver = meson.project_version().split('.')
+major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
+
+driver_install_path = join_paths(get_option('libdir'), 'dpdk',
+ 'pmds-' + major_version)
eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
# configure the build, and make sure configs here and in config folder are
--
2.19.0
next prev parent reply other threads:[~2018-10-02 13:06 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-28 17:58 [dpdk-dev] [PATCH] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-01 9:17 ` Bruce Richardson
2018-10-01 9:25 ` Bruce Richardson
2018-10-01 9:46 ` Luca Boccassi
2018-10-01 10:01 ` Bruce Richardson
2018-10-01 10:42 ` Timothy Redaelli
2018-10-01 11:06 ` Bruce Richardson
2018-10-01 11:24 ` Luca Boccassi
2018-10-02 11:02 ` Marco Varlese
2018-10-02 12:23 ` Bruce Richardson
2018-10-02 13:07 ` Luca Boccassi
2018-10-02 13:06 ` Luca Boccassi [this message]
2018-10-02 13:06 ` [dpdk-dev] [PATCH v2 2/2] " Luca Boccassi
2018-10-02 14:28 ` Bruce Richardson
2018-10-02 14:59 ` Luca Boccassi
2018-10-02 15:19 ` Bruce Richardson
2018-10-02 15:26 ` Luca Boccassi
2018-10-02 15:25 ` [dpdk-dev] [PATCH v3 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Luca Boccassi
2018-10-02 15:25 ` [dpdk-dev] [PATCH v3 2/2] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-02 15:58 ` Bruce Richardson
2018-10-02 16:21 ` Luca Boccassi
2018-10-02 16:20 ` [dpdk-dev] [PATCH v4 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Luca Boccassi
2018-10-02 16:20 ` [dpdk-dev] [PATCH v4 2/2] build: add drivers_install_subdir meson option Luca Boccassi
2018-10-02 16:30 ` Bruce Richardson
2018-10-05 16:00 ` Timothy Redaelli
2018-10-02 16:28 ` [dpdk-dev] [PATCH v4 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY Bruce Richardson
2018-10-05 16:00 ` Timothy Redaelli
2018-10-27 21:19 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181002130646.14919-1-bluca@debian.org \
--to=bluca@debian.org \
--cc=bruce.richardson@intel.com \
--cc=christian.ehrhardt@canonical.com \
--cc=dev@dpdk.org \
--cc=mvarlese@suse.de \
--cc=tredaelli@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).