[v2,1/4] hash: fix meson headers packaging

Message ID 20200129172621.28565-2-david.marchand@redhat.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series add ABI checks |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/Intel-compilation fail apply issues

Commit Message

David Marchand Jan. 29, 2020, 5:26 p.m. UTC
  Those headers are internal and should not be distributed.

Fixes: 5b9656b157d3 ("lib: build with meson")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 lib/librte_hash/meson.build | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
  

Comments

Luca Boccassi Jan. 30, 2020, 10:12 a.m. UTC | #1
On Wed, 2020-01-29 at 18:26 +0100, David Marchand wrote:
> Those headers are internal and should not be distributed.
> 
> Fixes: 5b9656b157d3 ("lib: build with meson")
> Cc: 
> stable@dpdk.org
> 
> 
> Signed-off-by: David Marchand <
> david.marchand@redhat.com
> >
> ---
>  lib/librte_hash/meson.build | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/lib/librte_hash/meson.build
> b/lib/librte_hash/meson.build
> index 5d02b3084..bce11ad9e 100644
> --- a/lib/librte_hash/meson.build
> +++ b/lib/librte_hash/meson.build
> @@ -1,10 +1,7 @@
>  # SPDX-License-Identifier: BSD-3-Clause
>  # Copyright(c) 2017 Intel Corporation
>  
> -headers = files('rte_cmp_arm64.h',
> -	'rte_cmp_x86.h',
> -	'rte_crc_arm64.h',
> -	'rte_cuckoo_hash.h',
> +headers = files('rte_crc_arm64.h',
>  	'rte_fbk_hash.h',
>  	'rte_hash_crc.h',
>  	'rte_hash.h',

Difficult question: how confident we are nobody is using those? :-)
  
David Marchand Jan. 30, 2020, 10:54 a.m. UTC | #2
On Thu, Jan 30, 2020 at 11:12 AM Luca Boccassi <bluca@debian.org> wrote:
>
> On Wed, 2020-01-29 at 18:26 +0100, David Marchand wrote:
> > Those headers are internal and should not be distributed.
> >
> > Fixes: 5b9656b157d3 ("lib: build with meson")
> > Cc:
> > stable@dpdk.org
> >
> >
> > Signed-off-by: David Marchand <
> > david.marchand@redhat.com
> > >
> > ---
> >  lib/librte_hash/meson.build | 5 +----
> >  1 file changed, 1 insertion(+), 4 deletions(-)
> >
> > diff --git a/lib/librte_hash/meson.build
> > b/lib/librte_hash/meson.build
> > index 5d02b3084..bce11ad9e 100644
> > --- a/lib/librte_hash/meson.build
> > +++ b/lib/librte_hash/meson.build
> > @@ -1,10 +1,7 @@
> >  # SPDX-License-Identifier: BSD-3-Clause
> >  # Copyright(c) 2017 Intel Corporation
> >
> > -headers = files('rte_cmp_arm64.h',
> > -     'rte_cmp_x86.h',
> > -     'rte_crc_arm64.h',
> > -     'rte_cuckoo_hash.h',
> > +headers = files('rte_crc_arm64.h',
> >       'rte_fbk_hash.h',
> >       'rte_hash_crc.h',
> >       'rte_hash.h',
>
> Difficult question: how confident we are nobody is using those? :-)

Those headers are for internal structures.
When installing with make, those headers were skipped.

Grepping on the dpdk projects that I monitor (based on Stephen list):

$ for header in rte_cmp_arm64.h rte_cmp_x86.h rte_cuckoo_hash.h; do
echo "======= $header"; git grep-all -l $header; echo; done
======= rte_cmp_arm64.h
F-Stack origin/HEAD:dpdk/lib/librte_hash/meson.build
F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.h
yastack origin/HEAD:dpdk/lib/librte_hash/meson.build
yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h

======= rte_cmp_x86.h
F-Stack origin/HEAD:dpdk/lib/librte_hash/meson.build
F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.h
yastack origin/HEAD:dpdk/lib/librte_hash/meson.build
yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h

======= rte_cuckoo_hash.h
F-Stack origin/HEAD:dpdk/lib/librte_hash/meson.build
F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.c
F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.c
Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.h
yastack origin/HEAD:dpdk/lib/librte_hash/meson.build
yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.c
yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
  
Luca Boccassi Jan. 30, 2020, 10:56 a.m. UTC | #3
On Thu, 2020-01-30 at 11:54 +0100, David Marchand wrote:
> On Thu, Jan 30, 2020 at 11:12 AM Luca Boccassi <
> bluca@debian.org
> > wrote:
> > On Wed, 2020-01-29 at 18:26 +0100, David Marchand wrote:
> > > Those headers are internal and should not be distributed.
> > > 
> > > Fixes: 5b9656b157d3 ("lib: build with meson")
> > > Cc:
> > > stable@dpdk.org
> > > 
> > > 
> > > 
> > > Signed-off-by: David Marchand <
> > > david.marchand@redhat.com
> > > 
> > > 
> > > ---
> > >  lib/librte_hash/meson.build | 5 +----
> > >  1 file changed, 1 insertion(+), 4 deletions(-)
> > > 
> > > diff --git a/lib/librte_hash/meson.build
> > > b/lib/librte_hash/meson.build
> > > index 5d02b3084..bce11ad9e 100644
> > > --- a/lib/librte_hash/meson.build
> > > +++ b/lib/librte_hash/meson.build
> > > @@ -1,10 +1,7 @@
> > >  # SPDX-License-Identifier: BSD-3-Clause
> > >  # Copyright(c) 2017 Intel Corporation
> > > 
> > > -headers = files('rte_cmp_arm64.h',
> > > -     'rte_cmp_x86.h',
> > > -     'rte_crc_arm64.h',
> > > -     'rte_cuckoo_hash.h',
> > > +headers = files('rte_crc_arm64.h',
> > >       'rte_fbk_hash.h',
> > >       'rte_hash_crc.h',
> > >       'rte_hash.h',
> > 
> > Difficult question: how confident we are nobody is using those? :-)
> 
> Those headers are for internal structures.
> When installing with make, those headers were skipped.
> 
> Grepping on the dpdk projects that I monitor (based on Stephen list):
> 
> $ for header in rte_cmp_arm64.h rte_cmp_x86.h rte_cuckoo_hash.h; do
> echo "======= $header"; git grep-all -l $header; echo; done
> ======= rte_cmp_arm64.h
> F-Stack origin/HEAD:dpdk/lib/librte_hash/meson.build
> F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
> Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.h
> yastack origin/HEAD:dpdk/lib/librte_hash/meson.build
> yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
> 
> ======= rte_cmp_x86.h
> F-Stack origin/HEAD:dpdk/lib/librte_hash/meson.build
> F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
> Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.h
> yastack origin/HEAD:dpdk/lib/librte_hash/meson.build
> yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
> 
> ======= rte_cuckoo_hash.h
> F-Stack origin/HEAD:dpdk/lib/librte_hash/meson.build
> F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.c
> F-Stack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h
> Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.c
> Trex origin/HEAD:src/dpdk/lib/librte_hash/rte_cuckoo_hash.h
> yastack origin/HEAD:dpdk/lib/librte_hash/meson.build
> yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.c
> yastack origin/HEAD:dpdk/lib/librte_hash/rte_cuckoo_hash.h

Great, thanks for checking!
  

Patch

diff --git a/lib/librte_hash/meson.build b/lib/librte_hash/meson.build
index 5d02b3084..bce11ad9e 100644
--- a/lib/librte_hash/meson.build
+++ b/lib/librte_hash/meson.build
@@ -1,10 +1,7 @@ 
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-headers = files('rte_cmp_arm64.h',
-	'rte_cmp_x86.h',
-	'rte_crc_arm64.h',
-	'rte_cuckoo_hash.h',
+headers = files('rte_crc_arm64.h',
 	'rte_fbk_hash.h',
 	'rte_hash_crc.h',
 	'rte_hash.h',