From patchwork Tue Oct 2 13:06: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: 45871 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 4B89E5B12; Tue, 2 Oct 2018 15:06:58 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 6D2242C36 for ; Tue, 2 Oct 2018 15:06:57 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id z204-v6so1298777wmc.5 for ; Tue, 02 Oct 2018 06:06:57 -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=hx0rSgtZMJ0BgfSi2KuYMWgnDbEPRg3d1IxLCTGxIJlmGjlhToqu057QR+W/GBBJ85 SF+QNvgduf5G/UpbMLMJD+chR4poSNwyRiSjwFxs3GBT/RTmse5CMmv8iMAjB3n5sAdX ZEwxb1snjIgzOjKOTGMyP9wLgqZL/21i4pzYEfENn9dZKAcSTKfmb8tGpfasCuAD1tjp JaTleiELE8C3GrJwYChkYrQI8f1DRvSBPKWDRA8Nfx90cjF6yYSv3DthTkNgiKVyq4Ui 0cGK28xvXiu3lNj7tqN1dE05VYw1gIFJOyYPbLUzJ8uIueqwHRbGtcQ0xaqwwE8nRUHC V1Tw== X-Gm-Message-State: ABuFfoiylBgJBXiV0MrfX0s8TyYPEKF1ovw31D0cHFvmqVlHbjNImbT6 G1qatFIaY0C0fkf6w4mTbfRV3GtC X-Google-Smtp-Source: ACcGV63GhvL1d1Yik3wviLYdqR9QWuNqcGnWadThWfNdsxVFkn67elzt6Qf6xjV9of6JGfgK8EgsyA== X-Received: by 2002:a1c:4d09:: with SMTP id o9-v6mr1728963wmh.134.1538485616706; Tue, 02 Oct 2018 06:06:56 -0700 (PDT) Received: from localhost ([2001:1be0:110d:fcfe:ed7d:79a1:9a42:d85f]) by smtp.gmail.com with ESMTPSA id p9-v6sm11045971wmc.37.2018.10.02.06.06.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 06:06:55 -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 14:06:45 +0100 Message-Id: <20181002130646.14919-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 v2 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 --- 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 13:06: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: 45872 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 102675F1D; Tue, 2 Oct 2018 15:07:00 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 3FA845F0D for ; Tue, 2 Oct 2018 15:06:59 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id 189-v6so2193321wmw.2 for ; Tue, 02 Oct 2018 06:06:59 -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=U+kaeGmi+20qrmwonf82e5tYi/Wb/Iup4w6MG5t/fV0=; b=N/wlOLiDcb/BZ3buMkVT5fdkcPtidqZVnl0M+ZHGL4T6c5/eO++wKrSirhhFhSXfA0 SxK+Zsb97Yv70psKeZOdf7N7uQTJfdJn6/SmN1wj0/fDcZvuynCoG0rXBfHa7rGic3yB 8Gl6HJ7bC5LIW92NpgIvdbtQW4s1kaaPlp46zoyfrOn8UUrxAYlvi9QheKo5T7l7MRiY rkNCzVW/cUn4ocAUhL84mGl83XNhUyAS/HWOIhJuVMEKZWExrCWTe7vxZ7iyKlN2N2IB rxBsRrLC9p5raCSGLImf2KllbwvDzfwFKoc2oAevj0uhXnxdqbolWizhicdoKq90tj1j +ISA== X-Gm-Message-State: ABuFfog+gNXbvaoXkdWD7rjsWnULixh++x4HjtJj+xzL6hSDiMyp/mV5 mdHfHo6r8amDtCBlVJGGziywbXex X-Google-Smtp-Source: ACcGV632rrMYelXcg8MYfoumTCzGexjHf8rQmf9Qdx3Ve1GAm+pemlQsuPZDxkN47EfcX7m1nTSA5g== X-Received: by 2002:a1c:6504:: with SMTP id z4-v6mr1729434wmb.130.1538485618523; Tue, 02 Oct 2018 06:06:58 -0700 (PDT) Received: from localhost ([2001:1be0:110d:fcfe:ed7d:79a1:9a42:d85f]) by smtp.gmail.com with ESMTPSA id 12-v6sm14336256wms.11.2018.10.02.06.06.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Oct 2018 06:06:57 -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 14:06:46 +0100 Message-Id: <20181002130646.14919-2-bluca@debian.org> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181002130646.14919-1-bluca@debian.org> References: <20180928175803.12955-1-bluca@debian.org> <20181002130646.14919-1-bluca@debian.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- meson.build | 10 ++++++++-- meson_options.txt | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 4bd04b9de3..9f7f17f7fe 100644 --- a/meson.build +++ b/meson.build @@ -20,8 +20,14 @@ 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 == 'dpdk/pmds-XX.YY' + driver_install_path = join_paths(get_option('libdir'), + 'dpdk', 'pmds-' + major_version) +else + driver_install_path = join_paths(get_option('libdir'), + pmd_subdir_opt) +endif 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..d0f5675eb7 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-XX.YY', + 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,