From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 703DAA0679 for ; Tue, 2 Apr 2019 11:57:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6D6C7316B; Tue, 2 Apr 2019 11:57:47 +0200 (CEST) Received: from mail-ua1-f67.google.com (mail-ua1-f67.google.com [209.85.222.67]) by dpdk.org (Postfix) with ESMTP id DAB942B99 for ; Tue, 2 Apr 2019 11:57:45 +0200 (CEST) Received: by mail-ua1-f67.google.com with SMTP id l17so4003347uar.4 for ; Tue, 02 Apr 2019 02:57:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=641qe1NV2aWmxVl4ncdsC865jxLuY647pwVGswP/GZ4=; b=Aao9IxiECNLQB7avZI1tLR1UZIyHTTG9AOyMtIi5YYVUZr+B0c5nLBNJ5kc77od2qH i6BW/W7MPya/sDyjqOnfjXfTtpoLN2ycU6Of/GuXP0MW4LU9kZce8ktI8EQfFYPLJ8Z9 iSpanZA+Y7KqDuLr4sFFVsyRGOgQgn0DeHA8fDfWjyALA74Vv2Hes9oRG9CLeGtVi4z6 3oBN1HT11h2Mol/NB1MKaws1EwhNAf6wi0yuaoT0nQWRdsYjzMdw6ccnd8G2jl57DY7x LDJuCJhfP/nxghr5hhEvEmnLzQuhpo+r6IRYsCTflGgfabHq4g61VjvBUhWVXhKKRah/ PZJg== X-Gm-Message-State: APjAAAWFM4VLUEKBApd05ojLc3/zifSUre+jy791OXhB+ykhKmhpLGWz rKO1JqG4T/tMzG5RuoMslaEVj+BpqqKH00J9hXIKUw== X-Google-Smtp-Source: APXvYqw2SsFsVcXX+CkULBmYuM6SzkYZ9x9h6eNTs2U2YGludRM6A3Y1usPpPoaCdGcrYzvJEXN5LD//iTuzwERD2hs= X-Received: by 2002:ab0:2858:: with SMTP id c24mr38112251uaq.4.1554199065277; Tue, 02 Apr 2019 02:57:45 -0700 (PDT) MIME-Version: 1.0 References: <20190401230712.31864-1-thomas@monjalon.net> In-Reply-To: <20190401230712.31864-1-thomas@monjalon.net> From: David Marchand Date: Tue, 2 Apr 2019 11:57:33 +0200 Message-ID: To: Thomas Monjalon Cc: dev , Bruce Richardson , Anand Rawat Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: Re: [dpdk-dev] [PATCH] eal: remove exec-env directory 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" Message-ID: <20190402095733.PbtuA-DYcxl5or2ihi0AdRB6b6x_Y9LcUr4C-5V1ViE@z> On Tue, Apr 2, 2019 at 1:07 AM Thomas Monjalon wrote: > Only one header file (rte_kni_common.h) was in the sub-directory > include/exec-env/ > This file was installed in a sub-directory of the same name. > Source and install directories are moved as below: > > lib/librte_eal/linux/eal/include/exec-env/ > -> lib/librte_eal/linux/eal/include/ > > build/include/exec-env/ > -> build/include/ > > The consequence is to have a file hierarchy a bit more flat. > > Signed-off-by: Thomas Monjalon > --- > devtools/check-includes.sh | 1 - > kernel/linux/kni/kni_dev.h | 2 +- > kernel/linux/kni/kni_fifo.h | 2 +- > kernel/linux/kni/kni_misc.c | 2 +- > kernel/linux/kni/kni_net.c | 2 +- > lib/librte_eal/freebsd/eal/Makefile | 3 +-- > lib/librte_eal/linux/eal/Makefile | 3 +-- > .../linux/eal/include/{exec-env => }/rte_kni_common.h | 0 > lib/librte_kni/rte_kni.c | 2 +- > lib/librte_kni/rte_kni.h | 2 +- > 10 files changed, 8 insertions(+), 11 deletions(-) > rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h > (100%) > Think you missed some bits in meson. lib/librte_eal/linux/eal/meson.build:install_subdir('include/exec-env', install_dir: get_option('includedir')) > diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh > index ba9d00ba3..3629ab4c7 100755 > --- a/devtools/check-includes.sh > +++ b/devtools/check-includes.sh > @@ -80,7 +80,6 @@ include_dir=${1:-build/include} > 'rte_byteorder_32.h' \ > 'rte_byteorder_64.h' \ > 'generic/*' \ > - 'exec-env/*' \ > 'rte_vhost.h' \ > 'rte_eth_vhost.h' \ > 'rte_eal_interrupts.h' \ > diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h > index 688f574a4..df46aa70e 100644 > --- a/kernel/linux/kni/kni_dev.h > +++ b/kernel/linux/kni/kni_dev.h > @@ -24,7 +24,7 @@ > #include > #include > > -#include > +#include > #define KNI_KTHREAD_RESCHEDULE_INTERVAL 5 /* us */ > > #define MBUF_BURST_SZ 32 > diff --git a/kernel/linux/kni/kni_fifo.h b/kernel/linux/kni/kni_fifo.h > index 3f4781c2e..5c91b5537 100644 > --- a/kernel/linux/kni/kni_fifo.h > +++ b/kernel/linux/kni/kni_fifo.h > @@ -6,7 +6,7 @@ > #ifndef _KNI_FIFO_H_ > #define _KNI_FIFO_H_ > > -#include > +#include > > /* Skip some memory barriers on Linux < 3.14 */ > #ifndef smp_load_acquire > diff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c > index 04c78eb87..31845e10f 100644 > --- a/kernel/linux/kni/kni_misc.c > +++ b/kernel/linux/kni/kni_misc.c > @@ -16,7 +16,7 @@ > #include > #include > > -#include > +#include > > #include "compat.h" > #include "kni_dev.h" > diff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c > index 7371b6d58..be9e6b0b9 100644 > --- a/kernel/linux/kni/kni_net.c > +++ b/kernel/linux/kni/kni_net.c > @@ -17,7 +17,7 @@ > #include > #include > > -#include > +#include > #include > > #include "compat.h" > diff --git a/lib/librte_eal/freebsd/eal/Makefile > b/lib/librte_eal/freebsd/eal/Makefile > index 5d5abf1bb..55d476e5b 100644 > --- a/lib/librte_eal/freebsd/eal/Makefile > +++ b/lib/librte_eal/freebsd/eal/Makefile > @@ -88,7 +88,6 @@ endif > > INC := # no bsd specific headers > > -SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include/exec-env := \ > - $(addprefix include/exec-env/,$(INC)) > +SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix > include/,$(INC)) > > include $(RTE_SDK)/mk/rte.lib.mk > diff --git a/lib/librte_eal/linux/eal/Makefile > b/lib/librte_eal/linux/eal/Makefile > index 932c93309..2aa6e8c6a 100644 > --- a/lib/librte_eal/linux/eal/Makefile > +++ b/lib/librte_eal/linux/eal/Makefile > @@ -95,7 +95,6 @@ endif > > INC := rte_kni_common.h > > -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include/exec-env := \ > - $(addprefix include/exec-env/,$(INC)) > +SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix > include/,$(INC)) > > include $(RTE_SDK)/mk/rte.lib.mk > diff --git a/lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h > b/lib/librte_eal/linux/eal/include/rte_kni_common.h > similarity index 100% > rename from lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h > rename to lib/librte_eal/linux/eal/include/rte_kni_common.h > diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c > index 492e207a3..192f2fed0 100644 > --- a/lib/librte_kni/rte_kni.c > +++ b/lib/librte_kni/rte_kni.c > @@ -21,7 +21,7 @@ > #include > #include > #include > -#include > +#include > #include "rte_kni_fifo.h" > > #define MAX_MBUF_BURST_NUM 32 > diff --git a/lib/librte_kni/rte_kni.h b/lib/librte_kni/rte_kni.h > index 02ca43b4b..9a9a7d754 100644 > --- a/lib/librte_kni/rte_kni.h > +++ b/lib/librte_kni/rte_kni.h > @@ -22,7 +22,7 @@ > #include > #include > > -#include > +#include > > #ifdef __cplusplus > extern "C" { > -- > 2.21.0 > > The rest lgtm. -- David Marchand