From patchwork Tue Oct 2 16:20:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 45906 X-Patchwork-Delegate: thomas@monjalon.net 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 12CFF5F38; Tue, 2 Oct 2018 18:20:52 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 720725F24 for ; Tue, 2 Oct 2018 18:20:51 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id s12-v6so2889317wmc.0 for ; Tue, 02 Oct 2018 09:20:51 -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:mime-version:content-transfer-encoding; bh=9dWwDVQruqP1wpxgE1yNj4TE8+nRd97dMcOtVh98gC8=; b=AR/GNThBi1UKJpnp3xZ9ti6k7v++y2PP+PjBVvXDUhYlhHewMEb6PApILSTazIx+NF hAolxb9nIBXN7c6R3CaJXPe9ZUfaWMKWKJJyeRfahC96JavZRR2AngTD0omgVLRwVmHp FMyj7G0HTJhAbYV0w5HP2voe6qA6zsJaFXiRblVBw270zODJ+/VOmz6++YWa4ED4TLdF rNwAhfc/YWMKR77X7SVmu6eMUaadzzXQjiJ3aUjEAude+T0oXnINnexNgfHFTNBSW/Pd cXgMMVJMtXdHMlkQPOBw+MG3Z6qjzivLJgbjkkVZQ6J4J432MXYBEFSzUZcO1gO/r/oC QLrg== X-Gm-Message-State: ABuFfojA2qWitn649UTeyTtmBTbpxF4lOZKhR3tIHMVUfDC56fSZkhOS jkLzJGw2iykckNofDUkohwBf3hBq X-Google-Smtp-Source: ACcGV62VsRcXwNIQJESCX3xiccUD2RxDbcxdRbZTBXrF1tIwE/fNj6J+dwU64ded2buFGfH0V9bNFw== X-Received: by 2002:a1c:790:: with SMTP id 138-v6mr2424794wmh.122.1538497250654; Tue, 02 Oct 2018 09:20:50 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id s10-v6sm18100547wmd.22.2018.10.02.09.20.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 09:20:49 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, tredaelli@redhat.com, christian.ehrhardt@canonical.com, mvarlese@suse.de, Luca Boccassi Date: Tue, 2 Oct 2018 17:20:45 +0100 Message-Id: <20181002162046.13668-1-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20180928175803.12955-1-bluca@debian.org> References: <20180928175803.12955-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 1/2] build: change default PMD installation subdir to dpdk/pmds-XX.YY 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" 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 Acked-by: Bruce Richardson Acked-by: Timothy Redaelli --- 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 From patchwork Tue Oct 2 16:20:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Boccassi X-Patchwork-Id: 45907 X-Patchwork-Delegate: thomas@monjalon.net 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 19CDE1B0FB; Tue, 2 Oct 2018 18:20:55 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 3CA6A7CDC for ; Tue, 2 Oct 2018 18:20:53 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id w5-v6so2932176wrt.2 for ; Tue, 02 Oct 2018 09:20:53 -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:mime-version:content-transfer-encoding; bh=NRtGSvsSl/C1OwT6kmNWqP/cN3dbNZlYSfAdb0O8Gys=; b=MtSGc08iBUlfNUX+D6vkzsh6Tsf7hIXeaZOmnvat31q+0VX2FVjHvXdslSLx9KUJkX U1WBZVefHL0O42ZWxai38DaDXhB+RAvi5SoIcLJascjGCDzh2JbF6gENIGAO985X6bX3 +TRZucpHyRmZSe5aUA+TmxzIhOUcb7d3k+h1ytuIBVT279GEgfQg2wxxc4FJXD8BOiqM U2qQlyJ5Np0x/F6Pk9OYG3uJfDcVKDl/0RPH9loptulQkoeOWi2uVf7Ue51L5Y6UATlY chq1wZfBcbFiUMoOO4XvVACoVhyBIJkjmguxg6KXv+nWBfJIb7SO5nfWMB/2bBYvsnVr vlZw== X-Gm-Message-State: ABuFfoiixw3oUvYRi185/O7YD51EPqupnnhsCr3EAGv6hlXI1d8EXo4q vOa9lJm+AuYQcywG0+qVKyXAcurx X-Google-Smtp-Source: ACcGV60WxQTo6XtUJVrz7YztiAu8CccSg1UaG2Mn8NQy65ix/0COCh7Ex0el5FQlVJOL5eJD38c67Q== X-Received: by 2002:adf:f9d1:: with SMTP id w17-v6mr11348898wrr.293.1538497252438; Tue, 02 Oct 2018 09:20:52 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id f7-v6sm1388971wrr.68.2018.10.02.09.20.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 09:20:51 -0700 (PDT) From: Luca Boccassi To: dev@dpdk.org Cc: bruce.richardson@intel.com, tredaelli@redhat.com, christian.ehrhardt@canonical.com, mvarlese@suse.de, Luca Boccassi Date: Tue, 2 Oct 2018 17:20:46 +0100 Message-Id: <20181002162046.13668-2-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002162046.13668-1-bluca@debian.org> References: <20180928175803.12955-1-bluca@debian.org> <20181002162046.13668-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 2/2] build: add drivers_install_subdir meson option 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" Allow users and packagers to override the default dpdk/drivers subdirectory where the PMDs get installed under $lib. Signed-off-by: Luca Boccassi Acked-by: Bruce Richardson Acked-by: Timothy Redaelli --- v3: changed default value to and use string.contains rather than exact equivalence v4: further optimisations suggested by review meson.build | 7 +++++-- meson_options.txt | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 4bd04b9de3..11697861c4 100644 --- a/meson.build +++ b/meson.build @@ -20,8 +20,11 @@ dpdk_extra_ldflags = [] 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) +pmd_subdir_opt = get_option('drivers_install_subdir') +if pmd_subdir_opt.contains('') + pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('')) +endif +driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt) eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # configure the build, and make sure configs here and in config folder are diff --git a/meson_options.txt b/meson_options.txt index d14bde892d..10b5416151 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ option('allow_invalid_socket_id', type: 'boolean', value: false, description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly') +option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', + description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') option('enable_driver_mlx_glue', type: 'boolean', value: false, description: 'Enable glue library for Mellanox PMDs') option('enable_kmods', type: 'boolean', value: true,