From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, david.marchand@redhat.com,
anand.rawat@intel.com
Subject: [dpdk-dev] [PATCH v3] eal: remove exec-env directory
Date: Tue, 2 Apr 2019 21:30:48 +0200 [thread overview]
Message-ID: <20190402193048.27410-1-thomas@monjalon.net> (raw)
Message-ID: <20190402193048.ApPLQx7OnscdlnI54fvOchBFvajTGQDkgggjsFi7wSs@z> (raw)
In-Reply-To: <20190401230712.31864-1-thomas@monjalon.net>
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
in the makefile-based build.
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 <thomas@monjalon.net>
---
v2: remove subdir install with meson on Linux
v3: add rte_kni_common.h in meson install
---
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_eal/linux/eal/meson.build | 3 +--
lib/librte_kni/rte_kni.c | 2 +-
lib/librte_kni/rte_kni.h | 2 +-
11 files changed, 9 insertions(+), 13 deletions(-)
rename lib/librte_eal/linux/eal/include/{exec-env => }/rte_kni_common.h (100%)
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 <linux/spinlock.h>
#include <linux/list.h>
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
#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 <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
/* 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 <net/net_namespace.h>
#include <net/netns/generic.h>
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
#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 <linux/kthread.h>
#include <linux/delay.h>
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
#include <kni_fifo.h>
#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_eal/linux/eal/meson.build b/lib/librte_eal/linux/eal/meson.build
index 7e68b2c0d..d223da638 100644
--- a/lib/librte_eal/linux/eal/meson.build
+++ b/lib/librte_eal/linux/eal/meson.build
@@ -2,10 +2,9 @@
# Copyright(c) 2017 Intel Corporation
eal_inc += include_directories('include')
-install_subdir('include/exec-env', install_dir: get_option('includedir'))
env_objs = []
-env_headers = []
+env_headers = files('include/rte_kni_common.h')
env_sources = files('eal_alarm.c',
'eal_cpuflags.c',
'eal_debug.c',
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 <rte_tailq.h>
#include <rte_rwlock.h>
#include <rte_eal_memconfig.h>
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
#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 <rte_mempool.h>
#include <rte_ether.h>
-#include <exec-env/rte_kni_common.h>
+#include <rte_kni_common.h>
#ifdef __cplusplus
extern "C" {
--
2.21.0
next prev parent reply other threads:[~2019-04-02 19:30 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-01 23:07 [dpdk-dev] [PATCH] " Thomas Monjalon
2019-04-01 23:07 ` Thomas Monjalon
2019-04-02 9:39 ` Bruce Richardson
2019-04-02 9:39 ` Bruce Richardson
2019-04-02 14:43 ` Ferruh Yigit
2019-04-02 14:43 ` Ferruh Yigit
2019-04-02 9:57 ` David Marchand
2019-04-02 9:57 ` David Marchand
2019-04-02 10:03 ` Thomas Monjalon
2019-04-02 10:03 ` Thomas Monjalon
2019-04-02 15:13 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2019-04-02 15:13 ` Thomas Monjalon
2019-04-02 19:30 ` Thomas Monjalon [this message]
2019-04-02 19:30 ` [dpdk-dev] [PATCH v3] " Thomas Monjalon
2019-04-02 19:46 ` David Marchand
2019-04-02 19:46 ` David Marchand
2019-04-02 19:50 ` Thomas Monjalon
2019-04-02 19:50 ` Thomas Monjalon
2019-04-03 8:41 ` David Marchand
2019-04-03 8:41 ` David Marchand
2019-04-02 19:52 ` Ferruh Yigit
2019-04-02 19:52 ` Ferruh Yigit
2019-04-02 19:55 ` David Marchand
2019-04-02 19:55 ` David Marchand
2019-04-02 19:57 ` Ferruh Yigit
2019-04-02 19:57 ` Ferruh Yigit
2019-04-02 20:04 ` David Marchand
2019-04-02 20:04 ` David Marchand
2019-04-02 20:09 ` Thomas Monjalon
2019-04-02 20:09 ` Thomas Monjalon
2019-04-03 13:34 ` Bruce Richardson
2019-04-03 13:34 ` Bruce Richardson
2019-04-02 19:50 ` Ferruh Yigit
2019-04-02 19:50 ` Ferruh Yigit
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=20190402193048.27410-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=anand.rawat@intel.com \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
/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).