From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <thomas@monjalon.net>
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 23CA46C9B
for <dev@dpdk.org>; Tue, 2 Apr 2019 21:30:53 +0200 (CEST)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id AF8F62227E;
Tue, 2 Apr 2019 15:30:52 -0400 (EDT)
Received: from mailfrontend1 ([10.202.2.162])
by compute1.internal (MEProxy); Tue, 02 Apr 2019 15:30:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=mesmtp; bh=F8UTtJeMzx
N7WavK7kAKR8weaD62NtbWM6zww5b/Pu8=; b=qkVei52sB+f0SNvH8qoKxnlxB1
PIEo/fBDa3V7qAXHNPDdLZzBEsmPve6d4f2ICRxsryWpfctcaMeSilZ8upyoAz/Y
7sDn7MCR62H1bQIERCePb40ixXXJ9AciMFd7ZwzzX1vCQbcuaiczEFVYgATxWCir
MnaGI/7CZIv0RLiKI=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm2; bh=F8UTtJeMzxN7WavK7kAKR8weaD62NtbWM6zww5b/Pu8=; b=KJqlQa8e
XuuiGKkWeGmekBjbeVgqnZbCHy9BEBfUw7uGz9PSdsfBhAo4bN5IeLuBgRWJlQGq
YX0y+rW69ygx0SQBPfvZQSL1LgPV5PlEyzuMwHjXdgUxgAJbrtO2xpoEYO2H9rbB
lqePmtLzCwAU3Gm9p4EVBkR5AfQAnnQjhvYwDa3z7ZC2nqYrKVsgD98pgR189Y4x
ZelP9wstdebFnNgpH/zPoG7NxZfuq5lAcZjZg/KxtSQeZHUxZGFE/N9CI/g7ip0F
I6JsOMc/XBU9W4W6gCrD5sk5MkB+f6QaAqBqr+pNMniKQ0ofXblntBIOw3CIKQvp
PS9zWuIlSu2eeQ==
X-ME-Sender: <xms:a7ijXEKHEKPmUrCNSODw9oi-Jk1poz2Cy-V8wVmftN6cQ5s_YJGH9A>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrtddtgdduudejucdltddurdeguddtrddttd
dmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfv
pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf
fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgr
lhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucffohhmrghinheplh
hisgdrmhhknecukfhppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghi
lhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghruf
hiiigvpedt
X-ME-Proxy: <xmx:a7ijXPRL2nivyuzlyDVs4cGevsHfgby-fRxB9PJAVLaBOiPc5ld8Bg>
<xmx:a7ijXLE1zcS7sMul2IUmu5t61Kd0E9ipQ1ahzO3-AwnRonwTxM9yaQ>
<xmx:a7ijXMXSW2nETg-VuoF9oP8Toakrmh4li_Dui1qK_E92ZQv5HUW56g>
<xmx:bLijXAvToPsV9mlvArRn2H03jflPF0hfePZymoBRHDRZJaKl5FZt0w>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 008E3E49DE;
Tue, 2 Apr 2019 15:30:50 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, david.marchand@redhat.com,
anand.rawat@intel.com
Date: Tue, 2 Apr 2019 21:30:48 +0200
Message-Id: <20190402193048.27410-1-thomas@monjalon.net>
X-Mailer: git-send-email 2.21.0
In-Reply-To: <20190401230712.31864-1-thomas@monjalon.net>
References: <20190401230712.31864-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v3] eal: remove exec-env directory
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Apr 2019 19:30:53 -0000
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
From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id C8EDAA0679
for <public@inbox.dpdk.org>; Tue, 2 Apr 2019 21:30:55 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 6FB457CCA;
Tue, 2 Apr 2019 21:30:54 +0200 (CEST)
Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com
[66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 23CA46C9B
for <dev@dpdk.org>; Tue, 2 Apr 2019 21:30:53 +0200 (CEST)
Received: from compute1.internal (compute1.nyi.internal [10.202.2.41])
by mailout.nyi.internal (Postfix) with ESMTP id AF8F62227E;
Tue, 2 Apr 2019 15:30:52 -0400 (EDT)
Received: from mailfrontend1 ([10.202.2.162])
by compute1.internal (MEProxy); Tue, 02 Apr 2019 15:30:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=mesmtp; bh=F8UTtJeMzx
N7WavK7kAKR8weaD62NtbWM6zww5b/Pu8=; b=qkVei52sB+f0SNvH8qoKxnlxB1
PIEo/fBDa3V7qAXHNPDdLZzBEsmPve6d4f2ICRxsryWpfctcaMeSilZ8upyoAz/Y
7sDn7MCR62H1bQIERCePb40ixXXJ9AciMFd7ZwzzX1vCQbcuaiczEFVYgATxWCir
MnaGI/7CZIv0RLiKI=
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm2; bh=F8UTtJeMzxN7WavK7kAKR8weaD62NtbWM6zww5b/Pu8=; b=KJqlQa8e
XuuiGKkWeGmekBjbeVgqnZbCHy9BEBfUw7uGz9PSdsfBhAo4bN5IeLuBgRWJlQGq
YX0y+rW69ygx0SQBPfvZQSL1LgPV5PlEyzuMwHjXdgUxgAJbrtO2xpoEYO2H9rbB
lqePmtLzCwAU3Gm9p4EVBkR5AfQAnnQjhvYwDa3z7ZC2nqYrKVsgD98pgR189Y4x
ZelP9wstdebFnNgpH/zPoG7NxZfuq5lAcZjZg/KxtSQeZHUxZGFE/N9CI/g7ip0F
I6JsOMc/XBU9W4W6gCrD5sk5MkB+f6QaAqBqr+pNMniKQ0ofXblntBIOw3CIKQvp
PS9zWuIlSu2eeQ==
X-ME-Sender: <xms:a7ijXEKHEKPmUrCNSODw9oi-Jk1poz2Cy-V8wVmftN6cQ5s_YJGH9A>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduuddrtddtgdduudejucdltddurdeguddtrddttd
dmucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfv
pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvf
fufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgr
lhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucffohhmrghinheplh
hisgdrmhhknecukfhppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghi
lhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghruf
hiiigvpedt
X-ME-Proxy: <xmx:a7ijXPRL2nivyuzlyDVs4cGevsHfgby-fRxB9PJAVLaBOiPc5ld8Bg>
<xmx:a7ijXLE1zcS7sMul2IUmu5t61Kd0E9ipQ1ahzO3-AwnRonwTxM9yaQ>
<xmx:a7ijXMXSW2nETg-VuoF9oP8Toakrmh4li_Dui1qK_E92ZQv5HUW56g>
<xmx:bLijXAvToPsV9mlvArRn2H03jflPF0hfePZymoBRHDRZJaKl5FZt0w>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id 008E3E49DE;
Tue, 2 Apr 2019 15:30:50 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, david.marchand@redhat.com,
anand.rawat@intel.com
Date: Tue, 2 Apr 2019 21:30:48 +0200
Message-Id: <20190402193048.27410-1-thomas@monjalon.net>
X-Mailer: git-send-email 2.21.0
In-Reply-To: <20190401230712.31864-1-thomas@monjalon.net>
References: <20190401230712.31864-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v3] eal: remove exec-env directory
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Content-Type: text/plain; charset="UTF-8"
Message-ID: <20190402193048.ApPLQx7OnscdlnI54fvOchBFvajTGQDkgggjsFi7wSs@z>
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