From: Bruce Richardson Date: Wed, 6 Mar 2019 16:22:42 +0000 (+0000) Subject: mk: use linux and freebsd in config names X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=218c4e68c1d9;p=dpdk.git mk: use linux and freebsd in config names Rather than using linuxapp and bsdapp everywhere, we can change things to use the, more readable, terms "linux" and "freebsd" in our build configs. Rather than renaming the configs we can just duplicate the existing ones with the new names using symlinks, and use the new names exclusively internally. ["make showconfigs" also only shows the new names to keep the list short] The result is that backward compatibility is kept fully but any new builds or development can be done using the newer names, i.e. both "make config T=x86_64-native-linuxapp-gcc" and "T=x86_64-native-linux-gcc" work. Signed-off-by: Bruce Richardson --- diff --git a/app/test-bbdev/test-bbdev.py b/app/test-bbdev/test-bbdev.py index acab9eb165..25340ec8ec 100755 --- a/app/test-bbdev/test-bbdev.py +++ b/app/test-bbdev/test-bbdev.py @@ -23,7 +23,7 @@ else: if "RTE_TARGET" in os.environ: dpdk_target = os.environ["RTE_TARGET"] else: - dpdk_target = "x86_64-native-linuxapp-gcc" + dpdk_target = "x86_64-native-linux-gcc" parser = argparse.ArgumentParser( description='BBdev Unit Test Application', diff --git a/app/test/autotest.py b/app/test/autotest.py index 12997fdf0e..46c469eee4 100644 --- a/app/test/autotest.py +++ b/app/test/autotest.py @@ -38,7 +38,7 @@ print(cmdline) # how many workers to run tests with. FreeBSD doesn't support multiple primary # processes, so make it 1, otherwise make it 4. ignored for non-parallel tests -n_processes = 1 if "bsdapp" in target else 4 +n_processes = 1 if "bsd" in target else 4 runner = autotest_runner.AutotestRunner(cmdline, target, test_blacklist, test_whitelist, n_processes) diff --git a/app/test/test.c b/app/test/test.c index 351c7f2759..d646f5160b 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -36,7 +36,7 @@ extern cmdline_parse_ctx_t main_ctx[]; const char *prgname; /* to be set to argv[0] */ -static const char *recursive_call; /* used in linuxapp for MP and other tests */ +static const char *recursive_call; /* used in linux for MP and other tests */ static int no_action(void){ return 0; } diff --git a/config/common_armv8a_linux b/config/common_armv8a_linux new file mode 100644 index 0000000000..72091de1c7 --- /dev/null +++ b/config/common_armv8a_linux @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc +# + +#include "common_linux" + +CONFIG_RTE_MACHINE="armv8a" + +CONFIG_RTE_ARCH="arm64" +CONFIG_RTE_ARCH_ARM64=y +CONFIG_RTE_ARCH_64=y + +CONFIG_RTE_FORCE_INTRINSICS=y + +# Maximum available cache line size in arm64 implementations. +# Setting to maximum available cache line size in generic config +# to address minimum DMA alignment across all arm64 implementations. +CONFIG_RTE_CACHE_LINE_SIZE=128 + +CONFIG_RTE_USE_C11_MEM_MODEL=y + +# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) +# to determine the best threshold in code. Refer to notes in source file +# (lib/librte_eal/common/include/arch/arm/rte_memcpy_64.h) for more info. +CONFIG_RTE_ARCH_ARM64_MEMCPY=n +#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048 +#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512 +# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're +# strong reasons. +#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n +#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF +#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n + +CONFIG_RTE_LIBRTE_FM10K_PMD=n +CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n +CONFIG_RTE_LIBRTE_AVP_PMD=n + +CONFIG_RTE_SCHED_VECTOR=n diff --git a/config/common_armv8a_linuxapp b/config/common_armv8a_linuxapp deleted file mode 100644 index ad88a37b14..0000000000 --- a/config/common_armv8a_linuxapp +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Cavium, Inc -# - -#include "common_linuxapp" - -CONFIG_RTE_MACHINE="armv8a" - -CONFIG_RTE_ARCH="arm64" -CONFIG_RTE_ARCH_ARM64=y -CONFIG_RTE_ARCH_64=y - -CONFIG_RTE_FORCE_INTRINSICS=y - -# Maximum available cache line size in arm64 implementations. -# Setting to maximum available cache line size in generic config -# to address minimum DMA alignment across all arm64 implementations. -CONFIG_RTE_CACHE_LINE_SIZE=128 - -CONFIG_RTE_USE_C11_MEM_MODEL=y - -# Accelarate rte_memcpy. Be sure to run unit test (memcpy_perf_autotest) -# to determine the best threshold in code. Refer to notes in source file -# (lib/librte_eal/common/include/arch/arm/rte_memcpy_64.h) for more info. -CONFIG_RTE_ARCH_ARM64_MEMCPY=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGNED_THRESHOLD=2048 -#CONFIG_RTE_ARM64_MEMCPY_UNALIGNED_THRESHOLD=512 -# Leave below RTE_ARM64_MEMCPY_xxx options commented out, unless there're -# strong reasons. -#CONFIG_RTE_ARM64_MEMCPY_SKIP_GCC_VER_CHECK=n -#CONFIG_RTE_ARM64_MEMCPY_ALIGN_MASK=0xF -#CONFIG_RTE_ARM64_MEMCPY_STRICT_ALIGN=n - -CONFIG_RTE_LIBRTE_FM10K_PMD=n -CONFIG_RTE_LIBRTE_SFC_EFX_PMD=n -CONFIG_RTE_LIBRTE_AVP_PMD=n - -CONFIG_RTE_SCHED_VECTOR=n diff --git a/config/common_bsdapp b/config/common_bsdapp deleted file mode 100644 index 456b394c4d..0000000000 --- a/config/common_bsdapp +++ /dev/null @@ -1,15 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="bsdapp" -CONFIG_RTE_EXEC_ENV_BSDAPP=y -CONFIG_RTE_EXEC_ENV_FREEBSD=y - -# -# FreeBSD contiguous memory driver settings -# -CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64 -CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2 -CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024 diff --git a/config/common_freebsd b/config/common_freebsd new file mode 100644 index 0000000000..456b394c4d --- /dev/null +++ b/config/common_freebsd @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2016 Intel Corporation + +#include "common_base" + +CONFIG_RTE_EXEC_ENV="bsdapp" +CONFIG_RTE_EXEC_ENV_BSDAPP=y +CONFIG_RTE_EXEC_ENV_FREEBSD=y + +# +# FreeBSD contiguous memory driver settings +# +CONFIG_RTE_CONTIGMEM_MAX_NUM_BUFS=64 +CONFIG_RTE_CONTIGMEM_DEFAULT_NUM_BUFS=2 +CONFIG_RTE_CONTIGMEM_DEFAULT_BUF_SIZE=1024*1024*1024 diff --git a/config/common_linux b/config/common_linux new file mode 100644 index 0000000000..75334273d4 --- /dev/null +++ b/config/common_linux @@ -0,0 +1,59 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2016 Intel Corporation + +#include "common_base" + +CONFIG_RTE_EXEC_ENV="linuxapp" +CONFIG_RTE_EXEC_ENV_LINUX=y +CONFIG_RTE_EXEC_ENV_LINUXAPP=y + +CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y +CONFIG_RTE_EAL_IGB_UIO=y +CONFIG_RTE_EAL_VFIO=y +CONFIG_RTE_KNI_KMOD=y +CONFIG_RTE_LIBRTE_KNI=y +CONFIG_RTE_LIBRTE_PMD_KNI=y +CONFIG_RTE_LIBRTE_VHOST=y +CONFIG_RTE_LIBRTE_VHOST_NUMA=y +CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n +CONFIG_RTE_LIBRTE_PMD_VHOST=y +CONFIG_RTE_LIBRTE_IFC_PMD=y +CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y +CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y +CONFIG_RTE_LIBRTE_PMD_TAP=y +CONFIG_RTE_LIBRTE_AVP_PMD=y +CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y +CONFIG_RTE_LIBRTE_NFP_PMD=y +CONFIG_RTE_LIBRTE_POWER=y +CONFIG_RTE_VIRTIO_USER=y +CONFIG_RTE_PROC_INFO=y + +CONFIG_RTE_LIBRTE_VMBUS=y +CONFIG_RTE_LIBRTE_NETVSC_PMD=y + +# +# Common libraries, before Bus/PMDs +# +CONFIG_RTE_LIBRTE_COMMON_DPAAX=y + +# NXP DPAA BUS and drivers +CONFIG_RTE_LIBRTE_DPAA_BUS=y +CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y +CONFIG_RTE_LIBRTE_DPAA_PMD=y +CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y +CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y +CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y + +# NXP FSLMC BUS and DPAA2 drivers +CONFIG_RTE_LIBRTE_FSLMC_BUS=y +CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y +CONFIG_RTE_LIBRTE_DPAA2_PMD=y +CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y +CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y +CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y +CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y + +# +# NXP ENETC PMD Driver +# +CONFIG_RTE_LIBRTE_ENETC_PMD=y diff --git a/config/common_linuxapp b/config/common_linuxapp deleted file mode 100644 index 75334273d4..0000000000 --- a/config/common_linuxapp +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation - -#include "common_base" - -CONFIG_RTE_EXEC_ENV="linuxapp" -CONFIG_RTE_EXEC_ENV_LINUX=y -CONFIG_RTE_EXEC_ENV_LINUXAPP=y - -CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y -CONFIG_RTE_EAL_IGB_UIO=y -CONFIG_RTE_EAL_VFIO=y -CONFIG_RTE_KNI_KMOD=y -CONFIG_RTE_LIBRTE_KNI=y -CONFIG_RTE_LIBRTE_PMD_KNI=y -CONFIG_RTE_LIBRTE_VHOST=y -CONFIG_RTE_LIBRTE_VHOST_NUMA=y -CONFIG_RTE_LIBRTE_VHOST_POSTCOPY=n -CONFIG_RTE_LIBRTE_PMD_VHOST=y -CONFIG_RTE_LIBRTE_IFC_PMD=y -CONFIG_RTE_LIBRTE_PMD_AF_PACKET=y -CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y -CONFIG_RTE_LIBRTE_PMD_TAP=y -CONFIG_RTE_LIBRTE_AVP_PMD=y -CONFIG_RTE_LIBRTE_VDEV_NETVSC_PMD=y -CONFIG_RTE_LIBRTE_NFP_PMD=y -CONFIG_RTE_LIBRTE_POWER=y -CONFIG_RTE_VIRTIO_USER=y -CONFIG_RTE_PROC_INFO=y - -CONFIG_RTE_LIBRTE_VMBUS=y -CONFIG_RTE_LIBRTE_NETVSC_PMD=y - -# -# Common libraries, before Bus/PMDs -# -CONFIG_RTE_LIBRTE_COMMON_DPAAX=y - -# NXP DPAA BUS and drivers -CONFIG_RTE_LIBRTE_DPAA_BUS=y -CONFIG_RTE_LIBRTE_DPAA_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA_SEC=y -CONFIG_RTE_LIBRTE_PMD_CAAM_JR=y - -# NXP FSLMC BUS and DPAA2 drivers -CONFIG_RTE_LIBRTE_FSLMC_BUS=y -CONFIG_RTE_LIBRTE_DPAA2_MEMPOOL=y -CONFIG_RTE_LIBRTE_DPAA2_PMD=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_EVENTDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_CMDIF_RAWDEV=y -CONFIG_RTE_LIBRTE_PMD_DPAA2_QDMA_RAWDEV=y - -# -# NXP ENETC PMD Driver -# -CONFIG_RTE_LIBRTE_ENETC_PMD=y diff --git a/config/defconfig_arm-armv7a-linux-gcc b/config/defconfig_arm-armv7a-linux-gcc new file mode 120000 index 0000000000..84619de43a --- /dev/null +++ b/config/defconfig_arm-armv7a-linux-gcc @@ -0,0 +1 @@ +defconfig_arm-armv7a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm-armv7a-linuxapp-gcc b/config/defconfig_arm-armv7a-linuxapp-gcc index 63f3a507bf..c9509b274d 100644 --- a/config/defconfig_arm-armv7a-linuxapp-gcc +++ b/config/defconfig_arm-armv7a-linuxapp-gcc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright (C) 2015 RehiveTech. All right reserved. -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="armv7a" diff --git a/config/defconfig_arm64-armv8a-linux-clang b/config/defconfig_arm64-armv8a-linux-clang new file mode 120000 index 0000000000..196808b982 --- /dev/null +++ b/config/defconfig_arm64-armv8a-linux-clang @@ -0,0 +1 @@ +defconfig_arm64-armv8a-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linux-gcc b/config/defconfig_arm64-armv8a-linux-gcc new file mode 120000 index 0000000000..0949519562 --- /dev/null +++ b/config/defconfig_arm64-armv8a-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-armv8a-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-armv8a-linuxapp-clang b/config/defconfig_arm64-armv8a-linuxapp-clang index 487714ea0a..d3b4dad532 100644 --- a/config/defconfig_arm64-armv8a-linuxapp-clang +++ b/config/defconfig_arm64-armv8a-linuxapp-clang @@ -2,7 +2,7 @@ # Copyright(c) 2017 Cavium, Inc # -#include "common_armv8a_linuxapp" +#include "common_armv8a_linux" CONFIG_RTE_TOOLCHAIN="clang" CONFIG_RTE_TOOLCHAIN_CLANG=y diff --git a/config/defconfig_arm64-armv8a-linuxapp-gcc b/config/defconfig_arm64-armv8a-linuxapp-gcc index a6ed90c519..58c4a4029a 100644 --- a/config/defconfig_arm64-armv8a-linuxapp-gcc +++ b/config/defconfig_arm64-armv8a-linuxapp-gcc @@ -2,7 +2,7 @@ # Copyright(c) 2015 Cavium, Inc # -#include "common_armv8a_linuxapp" +#include "common_armv8a_linux" CONFIG_RTE_TOOLCHAIN="gcc" CONFIG_RTE_TOOLCHAIN_GCC=y diff --git a/config/defconfig_arm64-bluefield-linux-gcc b/config/defconfig_arm64-bluefield-linux-gcc new file mode 120000 index 0000000000..dad37d5e79 --- /dev/null +++ b/config/defconfig_arm64-bluefield-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-bluefield-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-bluefield-linuxapp-gcc b/config/defconfig_arm64-bluefield-linuxapp-gcc index dd252c0e47..b496538819 100644 --- a/config/defconfig_arm64-bluefield-linuxapp-gcc +++ b/config/defconfig_arm64-bluefield-linuxapp-gcc @@ -2,7 +2,7 @@ # Copyright 2019 Mellanox Technologies, Ltd # -#include "defconfig_arm64-armv8a-linuxapp-gcc" +#include "defconfig_arm64-armv8a-linux-gcc" # Mellanox BlueField CONFIG_RTE_ARCH_ARM_TUNE="cortex-a72" diff --git a/config/defconfig_arm64-dpaa-linux-gcc b/config/defconfig_arm64-dpaa-linux-gcc new file mode 120000 index 0000000000..dc05caacf3 --- /dev/null +++ b/config/defconfig_arm64-dpaa-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-dpaa-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa-linuxapp-gcc b/config/defconfig_arm64-dpaa-linuxapp-gcc index 544b6770d3..b408d4f489 100644 --- a/config/defconfig_arm64-dpaa-linuxapp-gcc +++ b/config/defconfig_arm64-dpaa-linuxapp-gcc @@ -2,7 +2,7 @@ # Copyright 2016 Freescale Semiconductor, Inc. # Copyright 2017 NXP -#include "defconfig_arm64-armv8a-linuxapp-gcc" +#include "defconfig_arm64-armv8a-linux-gcc" # NXP (Freescale) - Soc Architecture with FMAN, QMAN & BMAN support CONFIG_RTE_MACHINE="dpaa" diff --git a/config/defconfig_arm64-dpaa2-linux-gcc b/config/defconfig_arm64-dpaa2-linux-gcc new file mode 120000 index 0000000000..9a6c6c4cb8 --- /dev/null +++ b/config/defconfig_arm64-dpaa2-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-dpaa2-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-dpaa2-linuxapp-gcc b/config/defconfig_arm64-dpaa2-linuxapp-gcc index 96f478a069..8b545f5f7f 100644 --- a/config/defconfig_arm64-dpaa2-linuxapp-gcc +++ b/config/defconfig_arm64-dpaa2-linuxapp-gcc @@ -3,7 +3,7 @@ # Copyright 2016 NXP # -#include "defconfig_arm64-armv8a-linuxapp-gcc" +#include "defconfig_arm64-armv8a-linux-gcc" # NXP (Freescale) - Soc Architecture with WRIOP and QBMAN support CONFIG_RTE_MACHINE="dpaa2" diff --git a/config/defconfig_arm64-stingray-linux-gcc b/config/defconfig_arm64-stingray-linux-gcc new file mode 120000 index 0000000000..829dd65f05 --- /dev/null +++ b/config/defconfig_arm64-stingray-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-stingray-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-stingray-linuxapp-gcc b/config/defconfig_arm64-stingray-linuxapp-gcc index 999250723f..7b33aa7afb 100644 --- a/config/defconfig_arm64-stingray-linuxapp-gcc +++ b/config/defconfig_arm64-stingray-linuxapp-gcc @@ -2,7 +2,7 @@ # Copyright (C) Broadcom 2017-2018. All rights reserved. # -#include "defconfig_arm64-armv8a-linuxapp-gcc" +#include "defconfig_arm64-armv8a-linux-gcc" # Broadcom - Stingray CONFIG_RTE_MACHINE="armv8a" diff --git a/config/defconfig_arm64-thunderx-linux-gcc b/config/defconfig_arm64-thunderx-linux-gcc new file mode 120000 index 0000000000..1b9c4ad211 --- /dev/null +++ b/config/defconfig_arm64-thunderx-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-thunderx-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-thunderx-linuxapp-gcc b/config/defconfig_arm64-thunderx-linuxapp-gcc index fd160aa04a..a52f066510 100644 --- a/config/defconfig_arm64-thunderx-linuxapp-gcc +++ b/config/defconfig_arm64-thunderx-linuxapp-gcc @@ -2,7 +2,7 @@ # Copyright(c) 2015 Cavium, Inc # -#include "defconfig_arm64-armv8a-linuxapp-gcc" +#include "defconfig_arm64-armv8a-linux-gcc" CONFIG_RTE_MACHINE="thunderx" diff --git a/config/defconfig_arm64-xgene1-linux-gcc b/config/defconfig_arm64-xgene1-linux-gcc new file mode 120000 index 0000000000..d5e8b5e550 --- /dev/null +++ b/config/defconfig_arm64-xgene1-linux-gcc @@ -0,0 +1 @@ +defconfig_arm64-xgene1-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_arm64-xgene1-linuxapp-gcc b/config/defconfig_arm64-xgene1-linuxapp-gcc index a2dd465b76..fbf576c4aa 100644 --- a/config/defconfig_arm64-xgene1-linuxapp-gcc +++ b/config/defconfig_arm64-xgene1-linuxapp-gcc @@ -2,7 +2,7 @@ # Copyright(c) 2015 Cavium, Inc # -#include "defconfig_arm64-armv8a-linuxapp-gcc" +#include "defconfig_arm64-armv8a-linux-gcc" CONFIG_RTE_MACHINE="xgene1" CONFIG_RTE_CACHE_LINE_SIZE=64 diff --git a/config/defconfig_i686-native-linux-gcc b/config/defconfig_i686-native-linux-gcc new file mode 120000 index 0000000000..927141d5dd --- /dev/null +++ b/config/defconfig_i686-native-linux-gcc @@ -0,0 +1 @@ +defconfig_i686-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_i686-native-linux-icc b/config/defconfig_i686-native-linux-icc new file mode 120000 index 0000000000..e6a466b3e3 --- /dev/null +++ b/config/defconfig_i686-native-linux-icc @@ -0,0 +1 @@ +defconfig_i686-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc index 9b70868595..0340c84cf3 100644 --- a/config/defconfig_i686-native-linuxapp-gcc +++ b/config/defconfig_i686-native-linuxapp-gcc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc index 17defd8032..34a55fd184 100644 --- a/config/defconfig_i686-native-linuxapp-icc +++ b/config/defconfig_i686-native-linuxapp-icc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_ppc_64-power8-linux-gcc b/config/defconfig_ppc_64-power8-linux-gcc new file mode 120000 index 0000000000..580c92e12e --- /dev/null +++ b/config/defconfig_ppc_64-power8-linux-gcc @@ -0,0 +1 @@ +defconfig_ppc_64-power8-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc index 8cbf7ed50c..7e248b755c 100644 --- a/config/defconfig_ppc_64-power8-linuxapp-gcc +++ b/config/defconfig_ppc_64-power8-linuxapp-gcc @@ -28,7 +28,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="power8" diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang index 8d2d10b483..7204738e14 100644 --- a/config/defconfig_x86_64-native-bsdapp-clang +++ b/config/defconfig_x86_64-native-bsdapp-clang @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_bsdapp" +#include "common_freebsd" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc index 174a74b0e4..b24e2e6d5a 100644 --- a/config/defconfig_x86_64-native-bsdapp-gcc +++ b/config/defconfig_x86_64-native-bsdapp-gcc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_bsdapp" +#include "common_freebsd" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_x86_64-native-freebsd-clang b/config/defconfig_x86_64-native-freebsd-clang new file mode 120000 index 0000000000..76115fd5a6 --- /dev/null +++ b/config/defconfig_x86_64-native-freebsd-clang @@ -0,0 +1 @@ +defconfig_x86_64-native-bsdapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-freebsd-gcc b/config/defconfig_x86_64-native-freebsd-gcc new file mode 120000 index 0000000000..72dd4b44be --- /dev/null +++ b/config/defconfig_x86_64-native-freebsd-gcc @@ -0,0 +1 @@ +defconfig_x86_64-native-bsdapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-clang b/config/defconfig_x86_64-native-linux-clang new file mode 120000 index 0000000000..3bcf89d6a4 --- /dev/null +++ b/config/defconfig_x86_64-native-linux-clang @@ -0,0 +1 @@ +defconfig_x86_64-native-linuxapp-clang \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-gcc b/config/defconfig_x86_64-native-linux-gcc new file mode 120000 index 0000000000..d707965941 --- /dev/null +++ b/config/defconfig_x86_64-native-linux-gcc @@ -0,0 +1 @@ +defconfig_x86_64-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linux-icc b/config/defconfig_x86_64-native-linux-icc new file mode 120000 index 0000000000..a36b47131a --- /dev/null +++ b/config/defconfig_x86_64-native-linux-icc @@ -0,0 +1 @@ +defconfig_x86_64-native-linuxapp-icc \ No newline at end of file diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang index 52d0d22fc1..7508c0f2da 100644 --- a/config/defconfig_x86_64-native-linuxapp-clang +++ b/config/defconfig_x86_64-native-linuxapp-clang @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc index afa5d478e9..db67066a57 100644 --- a/config/defconfig_x86_64-native-linuxapp-gcc +++ b/config/defconfig_x86_64-native-linuxapp-gcc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc index 59783111c4..d3ecae475c 100644 --- a/config/defconfig_x86_64-native-linuxapp-icc +++ b/config/defconfig_x86_64-native-linuxapp-icc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="native" diff --git a/config/defconfig_x86_x32-native-linux-gcc b/config/defconfig_x86_x32-native-linux-gcc new file mode 120000 index 0000000000..7ea00cecb3 --- /dev/null +++ b/config/defconfig_x86_x32-native-linux-gcc @@ -0,0 +1 @@ +defconfig_x86_x32-native-linuxapp-gcc \ No newline at end of file diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc index 2c8419f146..14445abaaa 100644 --- a/config/defconfig_x86_x32-native-linuxapp-gcc +++ b/config/defconfig_x86_x32-native-linuxapp-gcc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2014 Intel Corporation -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="native" diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index a10a38fa9b..753e4c23c5 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -40,8 +40,8 @@ ignore="( -name .svn -o -name CVS -o -name .hg -o -name .git ) -prune -o" source_dirs="app buildtools drivers examples lib" -skip_bsd="( -name bsdapp ) -prune -o" -skip_linux="( -name linuxapp ) -prune -o" +skip_bsd="( -name freebsd ) -prune -o" +skip_linux="( -name linux ) -prune -o" skip_arch="( -name arch ) -prune -o" skip_sse="( -name *_sse*.[chS] ) -prune -o" skip_avx="( -name *_avx*.[chS] ) -prune -o" @@ -146,8 +146,8 @@ check_valid_target() if [ -n "$2" ]; then check_valid_target $2 - echo $2 | grep -q "linuxapp-" || linux=false - echo $2 | grep -q "bsdapp-" || bsd=false + echo $2 | grep -q "linux" || linux=false + echo $2 | grep -q "bsd" || bsd=false echo $2 | grep -q "x86_64-" || x86_64=false echo $2 | grep -q "arm-" || arm_32=false echo $2 | grep -q "arm64-" || arm_64=false diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 19ff759ed0..70e91da525 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -46,7 +46,7 @@ print_help () { -v verbose build config: defconfig[[~][+]option1[[~][+]option2...]] - Example: x86_64-native-linuxapp-gcc+debug~RXTX_CALLBACKS + Example: x86_64-native-linux-gcc+debug~RXTX_CALLBACKS The lowercase options are defined inside $(basename $0). The uppercase options can be the end of a defconfig option to enable if prefixed with '+' or to disable if prefixed with '~'. diff --git a/devtools/validate-abi.sh b/devtools/validate-abi.sh index 138436d938..54df2e4761 100755 --- a/devtools/validate-abi.sh +++ b/devtools/validate-abi.sh @@ -9,7 +9,7 @@ set -e abicheck=abi-compliance-checker abidump=abi-dumper default_dst=abi-check -default_target=x86_64-native-linuxapp-gcc +default_target=x86_64-native-linux-gcc # trap on error err_report() { diff --git a/doc/build-sdk-quick.txt b/doc/build-sdk-quick.txt index ff297806a5..bcfa7d6fe1 100644 --- a/doc/build-sdk-quick.txt +++ b/doc/build-sdk-quick.txt @@ -1,7 +1,7 @@ Basic build make defconfig && make or - make config T=x86_64-native-linuxapp-gcc && make + make config T=x86_64-native-linux-gcc && make Build commands config get configuration from target template (T=) defconfig auto-select target template based on arch, OS, etc. diff --git a/doc/guides/compressdevs/octeontx.rst b/doc/guides/compressdevs/octeontx.rst index c57d03a8e8..5924ad1fa3 100644 --- a/doc/guides/compressdevs/octeontx.rst +++ b/doc/guides/compressdevs/octeontx.rst @@ -68,7 +68,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-thunderx-linuxapp-gcc install + make config T=arm64-thunderx-linux-gcc install Initialization @@ -97,7 +97,7 @@ probed. To use the PMD in an application, user must: reserve enough huge pages cd to the top-level DPDK directory - export RTE_TARGET=arm64-thunderx-linuxapp-gcc + export RTE_TARGET=arm64-thunderx-linux-gcc export RTE_SDK=`pwd` cd to app/test type the command "make" to compile diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 7b18de4092..d3dd694b65 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -7,12 +7,12 @@ Design Environment or Architecture-specific Sources -------------------------------------------- -In DPDK and DPDK applications, some code is specific to an architecture (i686, x86_64) or to an executive environment (bsdapp or linuxapp) and so on. +In DPDK and DPDK applications, some code is specific to an architecture (i686, x86_64) or to an executive environment (freebsd or linux) and so on. As far as is possible, all such instances of architecture or env-specific code should be provided via standard APIs in the EAL. By convention, a file is common if it is not located in a directory indicating that it is specific. For instance, a file located in a subdir of "x86_64" directory is specific to this architecture. -A file located in a subdir of "linuxapp" is specific to this execution environment. +A file located in a subdir of "linux" is specific to this execution environment. .. note:: @@ -81,7 +81,7 @@ are collected for any instance of any object type provided by the library: .. code-block:: console - # DPDK file config/common_linuxapp, config/common_bsdapp, etc. + # DPDK file config/common_linux, config/common_freebsd, etc. CONFIG_RTE__STATS_COLLECT=y/n The default value for this DPDK configuration file variable (either "yes" or diff --git a/doc/guides/contributing/patches.rst b/doc/guides/contributing/patches.rst index 211a5cdc7a..90927a52dd 100644 --- a/doc/guides/contributing/patches.rst +++ b/doc/guides/contributing/patches.rst @@ -437,7 +437,7 @@ Makefile System Compilation of patches and changes should be tested using the ``test-build.sh`` script in the ``devtools`` directory of the DPDK repo:: - devtools/test-build.sh x86_64-native-linuxapp-gcc+next+shared + devtools/test-build.sh x86_64-native-linux-gcc+next+shared The script usage is:: @@ -452,9 +452,9 @@ Where: Examples of configs are:: - x86_64-native-linuxapp-gcc - x86_64-native-linuxapp-gcc+next+shared - x86_64-native-linuxapp-clang+shared + x86_64-native-linux-gcc + x86_64-native-linux-gcc+next+shared + x86_64-native-linux-clang+shared The builds can be modified via the following environmental variables: @@ -468,9 +468,9 @@ These can be set from the command line or in the config files shown above in the The recommended configurations and options to test compilation prior to submitting patches are:: - x86_64-native-linuxapp-gcc+shared+next - x86_64-native-linuxapp-clang+shared - i686-native-linuxapp-gcc + x86_64-native-linux-gcc+shared+next + x86_64-native-linux-clang+shared + i686-native-linux-gcc export DPDK_DEP_ZLIB=y export DPDK_DEP_PCAP=y diff --git a/doc/guides/contributing/versioning.rst b/doc/guides/contributing/versioning.rst index 18b031998e..e7b326b5d9 100644 --- a/doc/guides/contributing/versioning.rst +++ b/doc/guides/contributing/versioning.rst @@ -557,13 +557,13 @@ on the local repo and target is the usual DPDK compilation target. For example:: # Check between the previous and latest commit: - ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linuxapp-gcc + ./devtools/validate-abi.sh HEAD~1 HEAD x86_64-native-linux-gcc # Check between two tags: - ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linuxapp-gcc + ./devtools/validate-abi.sh v2.0.0 v2.1.0 x86_64-native-linux-gcc # Check between git master and local topic-branch "vhost-hacking": - ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linuxapp-gcc + ./devtools/validate-abi.sh master vhost-hacking x86_64-native-linux-gcc After the validation script completes (it can take a while since it need to compile both tags) it will create compatibility reports in the diff --git a/doc/guides/cryptodevs/armv8.rst b/doc/guides/cryptodevs/armv8.rst index 725398daf0..e60af84002 100644 --- a/doc/guides/cryptodevs/armv8.rst +++ b/doc/guides/cryptodevs/armv8.rst @@ -42,7 +42,7 @@ In order to enable this virtual crypto PMD, user must: make -C $ARMV8_CRYPTO_LIB_PATH/ * Set CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=y in - config/defconfig_arm64-armv8a-linuxapp-gcc + config/defconfig_arm64-armv8a-linux-gcc The corresponding device can be created only if the following features are supported by the CPU: diff --git a/doc/guides/cryptodevs/caam_jr.rst b/doc/guides/cryptodevs/caam_jr.rst index e87ff09155..6622b79c7a 100644 --- a/doc/guides/cryptodevs/caam_jr.rst +++ b/doc/guides/cryptodevs/caam_jr.rst @@ -121,14 +121,14 @@ to enable caam_jr PMD. Please note that enabling debugging options may affect system performance. * ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR`` (default ``n``) - By default it is only enabled in common_linuxapp config. + By default it is only enabled in common_linux config. Toggle compilation of the ``librte_pmd_caam_jr`` driver. * ``CONFIG_RTE_LIBRTE_PMD_CAAM_JR_BE`` (default ``n``) By default it is disabled. It can be used when the underlying hardware supports the CAAM in BE mode. e.g. LS1043A, LS1046A supports CAAM in BE mode. - BE mode is enabled by default in defconfig-arm64-dpaa-linuxapp-gcc. + BE mode is enabled by default in defconfig-arm64-dpaa-linux-gcc. Installations ------------- @@ -138,7 +138,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-armv8a-linuxapp-gcc install + make config T=arm64-armv8a-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index aee79ab44f..21cb00360b 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -191,7 +191,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index 897a4fe809..0a26006342 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -131,7 +131,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa-linuxapp-gcc install + make config T=arm64-dpaa-linux-gcc install Enabling logs ------------- diff --git a/doc/guides/cryptodevs/openssl.rst b/doc/guides/cryptodevs/openssl.rst index bdc30f66fa..89aa5bac4d 100644 --- a/doc/guides/cryptodevs/openssl.rst +++ b/doc/guides/cryptodevs/openssl.rst @@ -67,7 +67,7 @@ For Ubuntu 14.04 LTS these packages have to be installed in the build system: .. code-block:: console sudo apt-get install openssl - sudo apt-get install libc6-dev-i386 # for i686-native-linuxapp-gcc target + sudo apt-get install libc6-dev-i386 # for i686-native-linux-gcc target This code was also verified on Fedora 24. This code has NOT been verified on FreeBSD yet. diff --git a/doc/guides/cryptodevs/virtio.rst b/doc/guides/cryptodevs/virtio.rst index cfc6d57d77..1496ec9208 100644 --- a/doc/guides/cryptodevs/virtio.rst +++ b/doc/guides/cryptodevs/virtio.rst @@ -79,8 +79,8 @@ Finally the front-end virtio crypto PMD driver can be installed: cd to the top-level DPDK directory sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO\)=n,\1=y,' config/common_base - make config T=x86_64-native-linuxapp-gcc - make install T=x86_64-native-linuxapp-gcc + make config T=x86_64-native-linux-gcc + make install T=x86_64-native-linux-gcc Tests ----- @@ -91,7 +91,7 @@ The unit test cases can be tested as below: reserve enough huge pages cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc export RTE_SDK=`pwd` cd to app/test type the command "make" to compile @@ -104,7 +104,7 @@ The performance can be tested as below: reserve enough huge pages cd to the top-level DPDK directory - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc export RTE_SDK=`pwd` cd to app/test-crypto-perf type the command "make" to compile diff --git a/doc/guides/cryptodevs/zuc.rst b/doc/guides/cryptodevs/zuc.rst index e389899685..69a5218b1e 100644 --- a/doc/guides/cryptodevs/zuc.rst +++ b/doc/guides/cryptodevs/zuc.rst @@ -62,7 +62,7 @@ In order to enable this virtual crypto PMD, user must: .. code-block:: console - make config T=x86_64-native-linuxapp-gcc + make config T=x86_64-native-linux-gcc sed -i 's,\(CONFIG_RTE_LIBRTE_PMD_ZUC\)=n,\1=y,' build/.config make diff --git a/doc/guides/eventdevs/dpaa.rst b/doc/guides/eventdevs/dpaa.rst index cfc40347a5..be68c6da6f 100644 --- a/doc/guides/eventdevs/dpaa.rst +++ b/doc/guides/eventdevs/dpaa.rst @@ -62,7 +62,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa-linuxapp-gcc install + make config T=arm64-dpaa-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/dpaa2.rst b/doc/guides/eventdevs/dpaa2.rst index 2b1700a5d9..332b1a31c4 100644 --- a/doc/guides/eventdevs/dpaa2.rst +++ b/doc/guides/eventdevs/dpaa2.rst @@ -71,7 +71,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Initialization -------------- diff --git a/doc/guides/eventdevs/octeontx.rst b/doc/guides/eventdevs/octeontx.rst index e276fd4409..ab36a36e0a 100644 --- a/doc/guides/eventdevs/octeontx.rst +++ b/doc/guides/eventdevs/octeontx.rst @@ -63,7 +63,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-thunderx-linuxapp-gcc install + make config T=arm64-thunderx-linux-gcc install Initialization diff --git a/doc/guides/freebsd_gsg/build_dpdk.rst b/doc/guides/freebsd_gsg/build_dpdk.rst index 102ce14134..7abd85aa5a 100644 --- a/doc/guides/freebsd_gsg/build_dpdk.rst +++ b/doc/guides/freebsd_gsg/build_dpdk.rst @@ -107,7 +107,7 @@ Where: * ``MACHINE`` is: ``native`` -* ``EXECENV`` is: ``bsdapp`` +* ``EXECENV`` is: ``freebsd`` * ``TOOLCHAIN`` is: ``gcc`` | ``clang`` @@ -130,7 +130,7 @@ For example to compile for FreeBSD use: .. code-block:: console - gmake install T=x86_64-native-bsdapp-clang + gmake install T=x86_64-native-freebsd-clang .. note:: @@ -208,7 +208,7 @@ An error such as: .. code-block:: console - kldload: can't load ./x86_64-native-bsdapp-gcc/kmod/contigmem.ko: + kldload: can't load ./x86_64-native-freebsd-gcc/kmod/contigmem.ko: Exec format error is generally attributed to not having enough contiguous memory diff --git a/doc/guides/freebsd_gsg/build_sample_apps.rst b/doc/guides/freebsd_gsg/build_sample_apps.rst index a085b6187d..0c1b9cb79f 100644 --- a/doc/guides/freebsd_gsg/build_sample_apps.rst +++ b/doc/guides/freebsd_gsg/build_sample_apps.rst @@ -13,7 +13,7 @@ Compiling a Sample Application ------------------------------ Once a DPDK target environment directory has been created (such as -``x86_64-native-bsdapp-clang``), it contains all libraries and header files required +``x86_64-native-freebsd-clang``), it contains all libraries and header files required to build an application. When compiling an application in the FreeBSD environment on the DPDK, @@ -22,8 +22,8 @@ the following variables must be exported: * ``RTE_SDK`` - Points to the DPDK installation directory. * ``RTE_TARGET`` - Points to the DPDK target environment directory. - For FreeBSD, this is the ``x86_64-native-bsdapp-clang`` or - ``x86_64-native-bsdapp-gcc`` directory. + For FreeBSD, this is the ``x86_64-native-freebsd-clang`` or + ``x86_64-native-freebsd-gcc`` directory. The following is an example of creating the ``helloworld`` application, which runs in the DPDK FreeBSD environment. While the example demonstrates compiling @@ -43,7 +43,7 @@ in the build directory. cd $(RTE_SDK) cd examples/helloworld/ setenv RTE_SDK $HOME/DPDK - setenv RTE_TARGET x86_64-native-bsdapp-gcc + setenv RTE_TARGET x86_64-native-freebsd-gcc gmake CC=gcc49 CC main.o @@ -67,7 +67,7 @@ in the build directory. setenv RTE_SDK /home/user/DPDK cp -r $(RTE_SDK)/examples/helloworld my_rte_app cd my_rte_app/ - setenv RTE_TARGET x86_64-native-bsdapp-gcc + setenv RTE_TARGET x86_64-native-freebsd-gcc gmake CC=gcc49 CC main.o diff --git a/doc/guides/freebsd_gsg/install_from_ports.rst b/doc/guides/freebsd_gsg/install_from_ports.rst index 253328eb10..633699e9d0 100644 --- a/doc/guides/freebsd_gsg/install_from_ports.rst +++ b/doc/guides/freebsd_gsg/install_from_ports.rst @@ -57,7 +57,7 @@ environmental variables should be set as below: * ``RTE_SDK=/usr/local/share/dpdk`` -* ``RTE_TARGET=x86_64-native-bsdapp-clang`` +* ``RTE_TARGET=x86_64-native-freebsd-clang`` .. note:: @@ -72,7 +72,7 @@ compiled and run as below: export RTE_SDK=/usr/local/share/dpdk - export RTE_TARGET=x86_64-native-bsdapp-clang + export RTE_TARGET=x86_64-native-freebsd-clang cp -r /usr/local/share/dpdk/examples/helloworld . diff --git a/doc/guides/freebsd_gsg/intro.rst b/doc/guides/freebsd_gsg/intro.rst index 115f428f92..e5611bca6e 100644 --- a/doc/guides/freebsd_gsg/intro.rst +++ b/doc/guides/freebsd_gsg/intro.rst @@ -7,7 +7,7 @@ Introduction This document contains instructions for installing and configuring the Data Plane Development Kit (DPDK) software. It is designed to get customers up and running quickly and describes how to compile and run a -DPDK application in a FreeBSD application (bsdapp) environment, without going +DPDK application in a FreeBSD application (freebsd) environment, without going deeply into detail. For a comprehensive guide to installing and using FreeBSD, the following @@ -37,7 +37,7 @@ The following is a list of DPDK documents in the suggested reading order: * **Programmer's Guide**: Describes: * The software architecture and how to use it (through examples), - specifically in a Linux* application (linuxapp) environment + specifically in a Linux* application (linux) environment * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development diff --git a/doc/guides/howto/lm_bond_virtio_sriov.rst b/doc/guides/howto/lm_bond_virtio_sriov.rst index a47d6dbf8d..ee8ccdaf55 100644 --- a/doc/guides/howto/lm_bond_virtio_sriov.rst +++ b/doc/guides/howto/lm_bond_virtio_sriov.rst @@ -591,7 +591,7 @@ Set up DPDK in the Virtual Machine rmmod virtio-pci ixgbevf modprobe uio - insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko + insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -613,7 +613,7 @@ Run testpmd in the Virtual Machine. # use for bonding of virtio and vf tests in VM - /root/dpdk/x86_64-default-linuxapp-gcc/app/testpmd \ + /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ -l 0-3 -n 4 --socket-mem 350 -- --i --port-topology=chained .. _lm_bond_virtio_sriov_switch_conf: diff --git a/doc/guides/howto/lm_virtio_vhost_user.rst b/doc/guides/howto/lm_virtio_vhost_user.rst index 3f5ebd58ab..6ebc10f71c 100644 --- a/doc/guides/howto/lm_virtio_vhost_user.rst +++ b/doc/guides/howto/lm_virtio_vhost_user.rst @@ -421,7 +421,7 @@ setup_dpdk_virtio_in_vm.sh rmmod virtio-pci modprobe uio - insmod /root/dpdk/x86_64-default-linuxapp-gcc/kmod/igb_uio.ko + insmod /root/dpdk/x86_64-default-linux-gcc/kmod/igb_uio.ko /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:03.0 /root/dpdk/usertools/dpdk-devbind.py -b igb_uio 0000:00:04.0 @@ -437,5 +437,5 @@ run_testpmd_in_vm.sh # Run testpmd for use with vhost_user sample app. # test system has 8 cpus (0-7), use cpus 2-7 for VM - /root/dpdk/x86_64-default-linuxapp-gcc/app/testpmd \ + /root/dpdk/x86_64-default-linux-gcc/app/testpmd \ -l 0-5 -n 4 --socket-mem 350 -- --burst=64 --i diff --git a/doc/guides/howto/pvp_reference_benchmark.rst b/doc/guides/howto/pvp_reference_benchmark.rst index 67fa232ec4..b90c63457b 100644 --- a/doc/guides/howto/pvp_reference_benchmark.rst +++ b/doc/guides/howto/pvp_reference_benchmark.rst @@ -132,7 +132,7 @@ Build DPDK: git clone git://dpdk.org/dpdk cd dpdk export RTE_SDK=$PWD - make install T=x86_64-native-linuxapp-gcc DESTDIR=install + make install T=x86_64-native-linux-gcc DESTDIR=install Testpmd launch @@ -346,7 +346,7 @@ Build DPDK: git clone git://dpdk.org/dpdk cd dpdk export RTE_SDK=$PWD - make install T=x86_64-native-linuxapp-gcc DESTDIR=install + make install T=x86_64-native-linux-gcc DESTDIR=install Testpmd launch diff --git a/doc/guides/howto/virtio_user_for_container_networking.rst b/doc/guides/howto/virtio_user_for_container_networking.rst index 2313dc794c..f31d918bcd 100644 --- a/doc/guides/howto/virtio_user_for_container_networking.rst +++ b/doc/guides/howto/virtio_user_for_container_networking.rst @@ -60,7 +60,7 @@ some minor changes. .. code-block:: console - make install RTE_SDK=`pwd` T=x86_64-native-linuxapp-gcc + make install RTE_SDK=`pwd` T=x86_64-native-linux-gcc #. Write a Dockerfile like below. @@ -70,7 +70,7 @@ some minor changes. FROM ubuntu:latest WORKDIR /usr/src/dpdk COPY . /usr/src/dpdk - ENV PATH "$PATH:/usr/src/dpdk/x86_64-native-linuxapp-gcc/app/" + ENV PATH "$PATH:/usr/src/dpdk/x86_64-native-linux-gcc/app/" EOT #. Build a Docker image. diff --git a/doc/guides/linux_gsg/build_dpdk.rst b/doc/guides/linux_gsg/build_dpdk.rst index d02fd7848e..7c0329fcc2 100644 --- a/doc/guides/linux_gsg/build_dpdk.rst +++ b/doc/guides/linux_gsg/build_dpdk.rst @@ -46,7 +46,7 @@ where: * ``MACHINE`` can be: ``native``, ``power8``, ``armv8a`` -* ``EXECENV`` can be: ``linuxapp``, ``bsdapp`` +* ``EXECENV`` can be: ``linux``, ``freebsd`` * ``TOOLCHAIN`` can be: ``gcc``, ``icc`` @@ -76,20 +76,20 @@ For example, to compile a 64-bit target using icc, run: .. code-block:: console - make install T=x86_64-native-linuxapp-icc + make install T=x86_64-native-linux-icc To compile a 32-bit build using gcc, the make command should be: .. code-block:: console - make install T=i686-native-linuxapp-gcc + make install T=i686-native-linux-gcc To prepare a target without building it, for example, if the configuration changes need to be made before compilation, use the ``make config T=`` command: .. code-block:: console - make config T=x86_64-native-linuxapp-gcc + make config T=x86_64-native-linux-gcc .. warning:: @@ -104,7 +104,7 @@ The user may also make modifications to the compile-time DPDK configuration by e .. code-block:: console - cd x86_64-native-linuxapp-gcc + cd x86_64-native-linux-gcc vi .config make diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 332424e05c..2f606535c3 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -15,7 +15,7 @@ It also provides a pointer to where sample applications are stored. Compiling a Sample Application ------------------------------ -Once an DPDK target environment directory has been created (such as ``x86_64-native-linuxapp-gcc``), +Once an DPDK target environment directory has been created (such as ``x86_64-native-linux-gcc``), it contains all libraries and header files required to build an application. When compiling an application in the Linux* environment on the DPDK, the following variables must be exported: @@ -36,7 +36,7 @@ By default, the binary is generated in the build directory. cd examples/helloworld/ export RTE_SDK=$HOME/DPDK - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc make CC main.o @@ -58,7 +58,7 @@ By default, the binary is generated in the build directory. export RTE_SDK=/home/user/DPDK cp -r $(RTE_SDK)/examples/helloworld my_rte_app cd my_rte_app/ - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc make CC main.o diff --git a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst index 9d1f0fa007..270a606742 100644 --- a/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +++ b/doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst @@ -76,11 +76,11 @@ Copy the NUMA header files and lib to the cross compiler's directories: Configure and cross compile DPDK Build -------------------------------------- -To configure a build, choose one of the target configurations, like arm64-dpaa2-linuxapp-gcc and arm64-thunderx-linuxapp-gcc. +To configure a build, choose one of the target configurations, like arm64-dpaa2-linux-gcc and arm64-thunderx-linux-gcc. .. code-block:: console - make config T=arm64-armv8a-linuxapp-gcc + make config T=arm64-armv8a-linux-gcc To cross-compile, without compiling the kernel modules, use the following command: @@ -128,5 +128,5 @@ command:: For example if the target machine is arm64 we can use the following command:: - meson arm64-build --cross-file config/arm/arm64_armv8_linuxapp_gcc + meson arm64-build --cross-file config/arm/arm64_armv8_linux_gcc ninja -C arm64-build diff --git a/doc/guides/linux_gsg/intro.rst b/doc/guides/linux_gsg/intro.rst index 74a8bc9fdc..94877f4ae2 100644 --- a/doc/guides/linux_gsg/intro.rst +++ b/doc/guides/linux_gsg/intro.rst @@ -6,7 +6,7 @@ Introduction This document contains instructions for installing and configuring the Data Plane Development Kit (DPDK) software. It is designed to get customers up and running quickly. -The document describes how to compile and run a DPDK application in a Linux application (linuxapp) environment, +The document describes how to compile and run a DPDK application in a Linux application (linux) environment, without going deeply into detail. Documentation Roadmap @@ -21,7 +21,7 @@ The following is a list of DPDK documents in the suggested reading order: * Programmer's Guide: Describes: - * The software architecture and how to use it (through examples), specifically in a Linux application (linuxapp) environment + * The software architecture and how to use it (through examples), specifically in a Linux application (linux) environment * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development kit and an application) and guidelines for porting an application diff --git a/doc/guides/linux_gsg/nic_perf_intel_platform.rst b/doc/guides/linux_gsg/nic_perf_intel_platform.rst index a556a40087..0c25ec03d4 100644 --- a/doc/guides/linux_gsg/nic_perf_intel_platform.rst +++ b/doc/guides/linux_gsg/nic_perf_intel_platform.rst @@ -133,7 +133,7 @@ Configurations before running DPDK # Build DPDK target. cd dpdk_folder - make install T=x86_64-native-linuxapp-gcc -j + make install T=x86_64-native-linux-gcc -j # Get the hugepage size. awk '/Hugepagesize/ {print $2}' /proc/meminfo diff --git a/doc/guides/linux_gsg/quick_start.rst b/doc/guides/linux_gsg/quick_start.rst index 43974df88a..d7b04ae01a 100644 --- a/doc/guides/linux_gsg/quick_start.rst +++ b/doc/guides/linux_gsg/quick_start.rst @@ -93,25 +93,25 @@ Some options in the script prompt the user for further data before proceeding. ------------------------------------------------------------------------ - [1] i686-native-linuxapp-gcc + [1] i686-native-linux-gcc - [2] i686-native-linuxapp-icc + [2] i686-native-linux-icc - [3] ppc_64-power8-linuxapp-gcc + [3] ppc_64-power8-linux-gcc - [4] x86_64-native-bsdapp-clang + [4] x86_64-native-freebsd-clang - [5] x86_64-native-bsdapp-gcc + [5] x86_64-native-freebsd-gcc - [6] x86_64-native-linuxapp-clang + [6] x86_64-native-linux-clang - [7] x86_64-native-linuxapp-gcc + [7] x86_64-native-linux-gcc - [8] x86_64-native-linuxapp-icc + [8] x86_64-native-linux-icc ------------------------------------------------------------------------ - Step 2: Setup linuxapp environment + Step 2: Setup linux environment ------------------------------------------------------------------------ @@ -135,7 +135,7 @@ Some options in the script prompt the user for further data before proceeding. ------------------------------------------------------------------------ - Step 3: Run test application for linuxapp environment + Step 3: Run test application for linux environment ------------------------------------------------------------------------ @@ -173,19 +173,19 @@ Some options in the script prompt the user for further data before proceeding. Option: -The following selection demonstrates the creation of the ``x86_64-native-linuxapp-gcc`` DPDK library. +The following selection demonstrates the creation of the ``x86_64-native-linux-gcc`` DPDK library. .. code-block:: console Option: 9 - ================== Installing x86_64-native-linuxapp-gcc + ================== Installing x86_64-native-linux-gcc Configuration done == Build lib ... Build complete - RTE_TARGET exported as x86_64-native-linuxapp-gcc + RTE_TARGET exported as x86_64-native-linux-gcc The following selection demonstrates the starting of the DPDK UIO driver. diff --git a/doc/guides/mempool/octeontx.rst b/doc/guides/mempool/octeontx.rst index 3ade61fc2c..dfa1993e19 100644 --- a/doc/guides/mempool/octeontx.rst +++ b/doc/guides/mempool/octeontx.rst @@ -56,7 +56,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-thunderx-linuxapp-gcc + make config T=arm64-thunderx-linux-gcc Initialization diff --git a/doc/guides/nics/build_and_test.rst b/doc/guides/nics/build_and_test.rst index d9a78eef0d..aae5c111dd 100644 --- a/doc/guides/nics/build_and_test.rst +++ b/doc/guides/nics/build_and_test.rst @@ -33,26 +33,26 @@ Example output: .. code-block:: console - arm-armv7a-linuxapp-gcc - arm64-armv8a-linuxapp-gcc - arm64-dpaa2-linuxapp-gcc - arm64-thunderx-linuxapp-gcc - arm64-xgene1-linuxapp-gcc - i686-native-linuxapp-gcc - i686-native-linuxapp-icc - ppc_64-power8-linuxapp-gcc - x86_64-native-bsdapp-clang - x86_64-native-bsdapp-gcc - x86_64-native-linuxapp-clang - x86_64-native-linuxapp-gcc - x86_64-native-linuxapp-icc - x86_x32-native-linuxapp-gcc + arm-armv7a-linux-gcc + arm64-armv8a-linux-gcc + arm64-dpaa2-linux-gcc + arm64-thunderx-linux-gcc + arm64-xgene1-linux-gcc + i686-native-linux-gcc + i686-native-linux-icc + ppc_64-power8-linux-gcc + x86_64-native-freebsd-clang + x86_64-native-freebsd-gcc + x86_64-native-linux-clang + x86_64-native-linux-gcc + x86_64-native-linux-icc + x86_x32-native-linux-gcc To compile a PMD for Linux x86_64 gcc target, run the following "make" command: .. code-block:: console - make install T=x86_64-native-linuxapp-gcc + make install T=x86_64-native-linux-gcc Use ARM (ThunderX, DPAA, X-Gene) or PowerPC target for respective platform. @@ -102,7 +102,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console modprobe uio - insmod ./x86_64-native-linuxapp-gcc/kmod/igb_uio.ko + insmod ./x86_64-native-linux-gcc/kmod/igb_uio.ko or @@ -139,7 +139,7 @@ This section demonstrates how to setup and run ``testpmd`` in Linux. .. code-block:: console - ./x86_64-native-linuxapp-gcc/app/testpmd -l 0-3 -n 4 -- -i + ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i Successful execution will show initialization messages from EAL, PMD and testpmd application. A prompt will be displayed at the end for user commands diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 58d88eef58..f3e6115068 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -493,7 +493,7 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - cp x86_64-native-bsdapp-clang/kmod/contigmem.ko /boot/kernel/ + cp x86_64-native-freebsd-clang/kmod/contigmem.ko /boot/kernel/ #. Add the following lines to /boot/loader.conf: @@ -574,13 +574,13 @@ devices managed by librte_pmd_cxgbe in FreeBSD operating system. .. code-block:: console - kldload ./x86_64-native-bsdapp-clang/kmod/nic_uio.ko + kldload ./x86_64-native-freebsd-clang/kmod/nic_uio.ko #. Start testpmd with basic parameters: .. code-block:: console - ./x86_64-native-bsdapp-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i + ./x86_64-native-freebsd-clang/app/testpmd -l 0-3 -n 4 -w 0000:02:00.4 -- -i Example output: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 2173673b95..fb7bc7d0c5 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -271,7 +271,7 @@ for details. .. code-block:: console - ./arm64-dpaa-linuxapp-gcc/testpmd -c 0xff -n 1 \ + ./arm64-dpaa-linux-gcc/testpmd -c 0xff -n 1 \ -- -i --portmask=0x3 --nb-cores=1 --no-flush-rx ..... diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index d4241ef45c..726a69e931 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -584,7 +584,7 @@ PMD. Typically, the limit has to be raised to higher than 2GB. e.g., 2621440 The compilation of any unused drivers can be disabled using the -configuration file in config/ directory (e.g., config/common_linuxapp). +configuration file in config/ directory (e.g., config/common_linux). This would help in bringing down the time taken for building the libraries and the initialization time of the application. diff --git a/doc/guides/nics/intel_vf.rst b/doc/guides/nics/intel_vf.rst index e8d5118a0d..ade5152595 100644 --- a/doc/guides/nics/intel_vf.rst +++ b/doc/guides/nics/intel_vf.rst @@ -521,19 +521,19 @@ The setup procedure is as follows: .. code-block:: console - make install T=x86_64-native-linuxapp-gcc - ./x86_64-native-linuxapp-gcc/app/testpmd -l 0-3 -n 4 -- -i + make install T=x86_64-native-linux-gcc + ./x86_64-native-linux-gcc/app/testpmd -l 0-3 -n 4 -- -i #. Finally, access the Guest OS using vncviewer with the localhost:5900 port and check the lspci command output in the Guest OS. The virtual functions will be listed as available for use. -#. Configure and install the DPDK with an x86_64-native-linuxapp-gcc configuration on the Guest OS as normal, +#. Configure and install the DPDK with an x86_64-native-linux-gcc configuration on the Guest OS as normal, that is, there is no change to the normal installation procedure. .. code-block:: console - make config T=x86_64-native-linuxapp-gcc O=x86_64-native-linuxapp-gcc - cd x86_64-native-linuxapp-gcc + make config T=x86_64-native-linux-gcc O=x86_64-native-linux-gcc + cd x86_64-native-linux-gcc make .. note:: diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 0b67496542..0200373008 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -223,7 +223,7 @@ These options can be modified in the ``.config`` file. .. note:: - For Bluefield, target should be set to ``arm64-bluefield-linuxapp-gcc``. This + For Bluefield, target should be set to ``arm64-bluefield-linux-gcc``. This will enable ``CONFIG_RTE_LIBRTE_MLX5_PMD`` and set ``RTE_CACHE_LINE_SIZE`` to 64. Default armv8a configuration of make build and meson build set it to 128 then brings performance degradation. diff --git a/doc/guides/nics/mvneta.rst b/doc/guides/nics/mvneta.rst index 2132a81974..c8b00ddf22 100644 --- a/doc/guides/nics/mvneta.rst +++ b/doc/guides/nics/mvneta.rst @@ -133,7 +133,7 @@ the path to the MUSDK installation directory needs to be exported. export LIBMUSDK_PATH=/usr/local export CROSS=aarch64-linux-gnu- - make config T=arm64-armv8a-linuxapp-gcc + make config T=arm64-armv8a-linux-gcc sed -ri 's,(MVNETA_PMD=)n,\1y,' build/.config make diff --git a/doc/guides/nics/mvpp2.rst b/doc/guides/nics/mvpp2.rst index 4101d2d89c..09e2f2a563 100644 --- a/doc/guides/nics/mvpp2.rst +++ b/doc/guides/nics/mvpp2.rst @@ -180,9 +180,9 @@ For additional instructions regarding DPDK cross compilation please refer to :do export LIBMUSDK_PATH=/usr/local export CROSS=/bin/aarch64-linux-gnu- export RTE_KERNELDIR= - export RTE_TARGET=arm64-armv8a-linuxapp-gcc + export RTE_TARGET=arm64-armv8a-linux-gcc - make config T=arm64-armv8a-linuxapp-gcc + make config T=arm64-armv8a-linux-gcc sed -i "s/MVNETA_PMD=y/MVNETA_PMD=n/" build/.config sed -i "s/MVPP2_PMD=n/MVPP2_PMD=y/" build/.config make diff --git a/doc/guides/nics/nfp.rst b/doc/guides/nics/nfp.rst index 3bfb0ef614..09a8529b96 100644 --- a/doc/guides/nics/nfp.rst +++ b/doc/guides/nics/nfp.rst @@ -75,7 +75,7 @@ compile it along with other DPDK PMDs even if no BSP was installed previously. Of course, a DPDK app will require such a BSP installed for using the NFP PMD, along with a specific NFP firmware application. -Default PMD configuration is at the **common_linuxapp configuration** file: +Default PMD configuration is at the **common_linux configuration** file: - **CONFIG_RTE_LIBRTE_NFP_PMD=y** diff --git a/doc/guides/nics/octeontx.rst b/doc/guides/nics/octeontx.rst index f8111d3cc2..012a3ec21f 100644 --- a/doc/guides/nics/octeontx.rst +++ b/doc/guides/nics/octeontx.rst @@ -71,7 +71,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-thunderx-linuxapp-gcc install + make config T=arm64-thunderx-linux-gcc install #. Running testpmd: @@ -83,7 +83,7 @@ following ``make`` command: .. code-block:: console - ./arm64-thunderx-linuxapp-gcc/app/testpmd -c 700 \ + ./arm64-thunderx-linux-gcc/app/testpmd -c 700 \ --base-virtaddr=0x100000000000 \ --mbuf-pool-ops-name="octeontx_fpavf" \ --vdev='event_octeontx' \ diff --git a/doc/guides/nics/softnic.rst b/doc/guides/nics/softnic.rst index 32a9cf22f6..c8962d90b9 100644 --- a/doc/guides/nics/softnic.rst +++ b/doc/guides/nics/softnic.rst @@ -54,7 +54,7 @@ Release Notes*. Build options ------------- -The default PMD configuration available in the common_linuxapp configuration file: +The default PMD configuration available in the common_linux configuration file: CONFIG_RTE_LIBRTE_PMD_SOFTNIC=y @@ -347,7 +347,7 @@ commands. .. code-block:: console - ./x86_64-native-linuxapp-gcc/app/testpmd -l 23-25 -n 4 \ + ./x86_64-native-linux-gcc/app/testpmd -l 23-25 -n 4 \ --vdev 'net_softnic0, \ firmware=./drivers/net/softnic/ \ firmware.cli, \ diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst index 9a3d7b348a..063bd0be41 100644 --- a/doc/guides/nics/tap.rst +++ b/doc/guides/nics/tap.rst @@ -181,7 +181,7 @@ used to build the dpdk you pulled down. Run pktgen from the pktgen directory in a terminal with a commandline like the following:: - sudo ./app/app/x86_64-native-linuxapp-gcc/app/pktgen -l 1-5 -n 4 \ + sudo ./app/app/x86_64-native-linux-gcc/app/pktgen -l 1-5 -n 4 \ --proc-type auto --log-level debug --socket-mem 512,512 --file-prefix pg \ --vdev=net_tap0 --vdev=net_tap1 -b 05:00.0 -b 05:00.1 \ -b 04:00.0 -b 04:00.1 -b 04:00.2 -b 04:00.3 \ diff --git a/doc/guides/nics/thunderx.rst b/doc/guides/nics/thunderx.rst index e84eaafe5c..53eaec72a7 100644 --- a/doc/guides/nics/thunderx.rst +++ b/doc/guides/nics/thunderx.rst @@ -70,7 +70,7 @@ Refer to the document :ref:`compiling and testing a PMD for a NIC - make config T=arm64-thunderx-linuxapp-gcc + make config T=arm64-thunderx-linux-gcc make The example applications can be compiled using the following: @@ -144,7 +144,7 @@ to build applications for **OCTEON TX** :sup:`®` platforms. cd export RTE_SDK=$PWD export RTE_KERNELDIR=$THUNDER_ROOT/linux/kernel/linux - make config T=arm64-thunderx-linuxapp-gcc + make config T=arm64-thunderx-linux-gcc make -j CROSS=aarch64-thunderx-linux-gnu- CONFIG_RTE_KNI_KMOD=n CONFIG_RTE_EAL_IGB_UIO=n EXTRA_CFLAGS="-isystem /include" EXTRA_LDFLAGS="-L/lib -lnuma" If NUMA support is not required, it can be disabled as explained in @@ -154,7 +154,7 @@ Following steps could be used in that case. .. code-block:: console - make config T=arm64-thunderx-linuxapp-gcc + make config T=arm64-thunderx-linux-gcc make CROSS=aarch64-thunderx-linux-gnu- diff --git a/doc/guides/prog_guide/build_app.rst b/doc/guides/prog_guide/build_app.rst index fa6aa8a2fa..bffa55bbef 100644 --- a/doc/guides/prog_guide/build_app.rst +++ b/doc/guides/prog_guide/build_app.rst @@ -16,7 +16,7 @@ RTE_SDK and RTE_TARGET. ~/DPDK$ cd examples/helloworld/ ~/DPDK/examples/helloworld$ export RTE_SDK=/home/user/DPDK - ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linuxapp-gcc + ~/DPDK/examples/helloworld$ export RTE_TARGET=x86_64-native-linux-gcc ~/DPDK/examples/helloworld$ make CC main.o LD helloworld @@ -40,7 +40,7 @@ The sample application (Hello World) can be duplicated in a new directory as a s ~$ cp -r DPDK/examples/helloworld my_rte_app ~$ cd my_rte_app/ ~/my_rte_app$ export RTE_SDK=/home/user/DPDK - ~/my_rte_app$ export RTE_TARGET=x86_64-native-linuxapp-gcc + ~/my_rte_app$ export RTE_TARGET=x86_64-native-linux-gcc ~/my_rte_app$ make CC main.o LD helloworld diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 8cb63c9a09..96dbf30e0d 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -31,13 +31,13 @@ Each build directory contains include files, libraries, and applications. A build directory is specific to a configuration that includes architecture + execution environment + toolchain. It is possible to have several build directories sharing the same sources with different configurations. -For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linuxapp, +For instance, to create a new build directory called my_sdk_build_dir using the default configuration template config/defconfig_x86_64-linux, we use: .. code-block:: console cd ${RTE_SDK} - make config T=x86_64-native-linuxapp-gcc O=my_sdk_build_dir + make config T=x86_64-native-linux-gcc O=my_sdk_build_dir This creates a new my_sdk_build_dir directory. After that, we can compile by doing: @@ -65,7 +65,7 @@ To compile an application, the user must set the RTE_SDK and RTE_TARGET environm .. code-block:: console export RTE_SDK=/opt/DPDK - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc cd /path/to/my_app For a new application, the user must create their own Makefile that includes some .mk files, such as @@ -246,7 +246,7 @@ Useful Variables Provided by the Build System * RTE_TOOLCHAIN: Defines the toolchain (gcc , icc). It is the same value as CONFIG_RTE_TOOLCHAIN but without the double-quotes around the string. -* RTE_EXEC_ENV: Defines the executive environment (linuxapp). +* RTE_EXEC_ENV: Defines the executive environment (linux). It is the same value as CONFIG_RTE_EXEC_ENV but without the double-quotes around the string. * RTE_KERNELDIR: This variable contains the absolute path to the kernel sources that will be used to compile the kernel modules. diff --git a/doc/guides/prog_guide/dev_kit_root_make_help.rst b/doc/guides/prog_guide/dev_kit_root_make_help.rst index 633161f099..a30db7d5b4 100644 --- a/doc/guides/prog_guide/dev_kit_root_make_help.rst +++ b/doc/guides/prog_guide/dev_kit_root_make_help.rst @@ -27,7 +27,7 @@ This is an optional parameter, the default output directory is build. .. code-block:: console - make config O=mybuild T=x86_64-native-linuxapp-gcc + make config O=mybuild T=x86_64-native-linux-gcc Build Targets ------------- @@ -163,7 +163,7 @@ For instance, the following command: .. code-block:: console cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linuxapp-gcc + make config O=mybuild T=x86_64-native-linux-gcc make O=mybuild is equivalent to: @@ -171,7 +171,7 @@ is equivalent to: .. code-block:: console cd $(RTE_SDK) - make config O=mybuild T=x86_64-native-linuxapp-gcc + make config O=mybuild T=x86_64-native-linux-gcc cd mybuild # no need to specify O= now diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index e1d80c02a2..2361c3b8f2 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -54,7 +54,7 @@ A check is also performed at initialization time to ensure that the micro archit Then, the main() function is called. The core initialization and launch is done in rte_eal_init() (see the API documentation). It consist of calls to the pthread library (more specifically, pthread_self(), pthread_create(), and pthread_setaffinity_np()). -.. _figure_linuxapp_launch: +.. _figure_linux_launch: .. figure:: img/linuxapp_launch.* @@ -79,7 +79,7 @@ API documentation for details. Multi-process Support ~~~~~~~~~~~~~~~~~~~~~ -The Linuxapp EAL allows a multi-process as well as a multi-threaded (pthread) deployment model. +The Linux EAL allows a multi-process as well as a multi-threaded (pthread) deployment model. See chapter :ref:`Multi-process Support ` for more details. diff --git a/doc/guides/prog_guide/ext_app_lib_make_help.rst b/doc/guides/prog_guide/ext_app_lib_make_help.rst index 7e8e9fd3a0..4312778dc9 100644 --- a/doc/guides/prog_guide/ext_app_lib_make_help.rst +++ b/doc/guides/prog_guide/ext_app_lib_make_help.rst @@ -22,7 +22,7 @@ The following variables must be defined: * ${RTE_SDK}: Points to the root directory of the DPDK. -* ${RTE_TARGET}: Reference the target to be used for compilation (for example, x86_64-native-linuxapp-gcc). +* ${RTE_TARGET}: Reference the target to be used for compilation (for example, x86_64-native-linux-gcc). Build Targets ------------- @@ -94,5 +94,5 @@ It is possible to run the Makefile from another directory, by specifying the out .. code-block:: console export RTE_SDK=/path/to/DPDK - export RTE_TARGET=x86_64-native-linuxapp-icc + export RTE_TARGET=x86_64-native-linux-icc make -f /path/to/my_app/Makefile S=/path/to/my_app O=/path/to/build_dir diff --git a/doc/guides/prog_guide/extend_dpdk.rst b/doc/guides/prog_guide/extend_dpdk.rst index 725994ee09..a3b3d300b0 100644 --- a/doc/guides/prog_guide/extend_dpdk.rst +++ b/doc/guides/prog_guide/extend_dpdk.rst @@ -73,7 +73,7 @@ To add a new library to the DPDK, proceed as follows: .. code-block:: console cd ${RTE_SDK} - make config T=x86_64-native-linuxapp-gcc + make config T=x86_64-native-linux-gcc make @@ -105,5 +105,5 @@ Once you have added a library, a new test case should be added in the test appli .. code-block:: console cd ${RTE_SDK} - make config T=x86_64-native-linuxapp-gcc + make config T=x86_64-native-linux-gcc make diff --git a/doc/guides/prog_guide/glossary.rst b/doc/guides/prog_guide/glossary.rst index dda45bd18f..21063a4147 100644 --- a/doc/guides/prog_guide/glossary.rst +++ b/doc/guides/prog_guide/glossary.rst @@ -205,7 +205,7 @@ SW Target In the DPDK, the target is a combination of architecture, machine, executive environment and toolchain. For example: - i686-native-linuxapp-gcc. + i686-native-linux-gcc. TCP Transmission Control Protocol diff --git a/doc/guides/prog_guide/img/linuxapp_launch.svg b/doc/guides/prog_guide/img/linuxapp_launch.svg index af685897d0..3af560554b 100644 --- a/doc/guides/prog_guide/img/linuxapp_launch.svg +++ b/doc/guides/prog_guide/img/linuxapp_launch.svg @@ -17,9 +17,9 @@ id="svg2" sodipodi:version="0.32" inkscape:version="0.48.4 r9939" - sodipodi:docname="linuxapp_launch.svg" + sodipodi:docname="linux_launch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/matz/rapports/doc/intel/architecture_docs/linuxapp_launch.png" + inkscape:export-filename="/home/matz/rapports/doc/intel/architecture_docs/linux_launch.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" version="1.1"> diff --git a/doc/guides/prog_guide/intro.rst b/doc/guides/prog_guide/intro.rst index be556a7427..5b319d36d9 100644 --- a/doc/guides/prog_guide/intro.rst +++ b/doc/guides/prog_guide/intro.rst @@ -31,7 +31,7 @@ The following is a list of DPDK documents in the suggested reading order: * **Programmer's Guide** (this document): Describes: * The software architecture and how to use it (through examples), - specifically in a Linux* application (linuxapp) environment + specifically in a Linux* application (linux) environment * The content of the DPDK, the build system (including the commands that can be used in the root DPDK Makefile to build the development kit and an application) diff --git a/doc/guides/prog_guide/overview.rst b/doc/guides/prog_guide/overview.rst index c01f37e3c6..986c896908 100644 --- a/doc/guides/prog_guide/overview.rst +++ b/doc/guides/prog_guide/overview.rst @@ -52,7 +52,7 @@ The following are examples of how the variables can be set: .. code-block:: console export RTE_SDK=/home/user/DPDK - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started Guide* for information on setting up the development environment. diff --git a/doc/guides/prog_guide/profile_app.rst b/doc/guides/prog_guide/profile_app.rst index 02f05614a2..5af795c0d4 100644 --- a/doc/guides/prog_guide/profile_app.rst +++ b/doc/guides/prog_guide/profile_app.rst @@ -84,7 +84,7 @@ an armv8 machine. make sudo insmod pmu_el0_cycle_counter.ko cd $DPDK_DIR - make config T=arm64-armv8a-linuxapp-gcc + make config T=arm64-armv8a-linux-gcc echo "CONFIG_RTE_ARM_EAL_RDTSC_USE_PMU=y" >> build/.config make diff --git a/doc/guides/prog_guide/qos_framework.rst b/doc/guides/prog_guide/qos_framework.rst index 0ce3cd58da..a7527b21ca 100644 --- a/doc/guides/prog_guide/qos_framework.rst +++ b/doc/guides/prog_guide/qos_framework.rst @@ -1511,7 +1511,7 @@ To enable it, use the DPDK configuration parameter: This parameter must be set to y. The parameter is found in the build configuration files in the DPDK/config directory, -for example, DPDK/config/common_linuxapp. +for example, DPDK/config/common_linux. RED configuration parameters are specified in the rte_red_params structure within the rte_sched_port_params structure that is passed to the scheduler on initialization. RED parameters are specified separately for four traffic classes and three packet colors (green, yellow and red) diff --git a/doc/guides/rawdevs/dpaa2_cmdif.rst b/doc/guides/rawdevs/dpaa2_cmdif.rst index bebda8333e..6db06777c7 100644 --- a/doc/guides/rawdevs/dpaa2_cmdif.rst +++ b/doc/guides/rawdevs/dpaa2_cmdif.rst @@ -77,7 +77,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Initialization -------------- diff --git a/doc/guides/rawdevs/dpaa2_qdma.rst b/doc/guides/rawdevs/dpaa2_qdma.rst index 793a8513fd..359e4c69fd 100644 --- a/doc/guides/rawdevs/dpaa2_qdma.rst +++ b/doc/guides/rawdevs/dpaa2_qdma.rst @@ -81,7 +81,7 @@ following ``make`` command: .. code-block:: console cd - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Initialization -------------- diff --git a/doc/guides/rel_notes/release_19_02.rst b/doc/guides/rel_notes/release_19_02.rst index 6bacbdb8f9..b353620b72 100644 --- a/doc/guides/rel_notes/release_19_02.rst +++ b/doc/guides/rel_notes/release_19_02.rst @@ -110,7 +110,7 @@ New Features * Added static linkage of ``mlx`` dependency. * Improved stability of E-Switch flow driver. * Added new make build configuration to set the cacheline size for Bluefield - correctly - ``arm64-bluefield-linuxapp-gcc``. + correctly - ``arm64-bluefield-linux-gcc``. * **Updated the enic driver.** diff --git a/doc/guides/rel_notes/release_2_1.rst b/doc/guides/rel_notes/release_2_1.rst index 0c27826f91..beadc51ba4 100644 --- a/doc/guides/rel_notes/release_2_1.rst +++ b/doc/guides/rel_notes/release_2_1.rst @@ -70,7 +70,7 @@ New Features * In UIO, the RX interrupt shares the same vector with other interrupts. When the RX interrupt and LSC interrupt are both enabled, only the former is available. - * RX interrupt is only implemented for the linuxapp target. + * RX interrupt is only implemented for the linux target. * The feature is only currently enabled for tow PMDs: ixgbe and igb. diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 653f972f3b..40a3264abe 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -46,7 +46,7 @@ Compiling the Application .. code-block:: console - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started Guide* for possible RTE_TARGET values. @@ -78,7 +78,7 @@ the specified baseband operation are available on application initialization. This means that HW baseband device/s must be bound to a DPDK driver or a SW baseband device/s (virtual BBdev) must be created (using --vdev). -To run the application in linuxapp environment with the turbo_sw baseband device +To run the application in linux environment with the turbo_sw baseband device using the whitelisted port running on 1 encoding lcore and 1 decoding lcore issue the command: @@ -116,7 +116,7 @@ ports. .. code-block:: console - $ ./pktgen-3.4.0/app/x86_64-native-linuxapp-gcc/pktgen -c 0x3 \ + $ ./pktgen-3.4.0/app/x86_64-native-linux-gcc/pktgen -c 0x3 \ --socket-mem=1,1 --file-prefix=pg -w -- -m 1.0 -P where: diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst index b38a5b3359..828a607bec 100644 --- a/doc/guides/sample_app_ug/cmd_line.rst +++ b/doc/guides/sample_app_ug/cmd_line.rst @@ -48,7 +48,7 @@ The application is located in the ``cmd_line`` sub-directory. Running the Application ----------------------- -To run the application in linuxapp environment, issue the following command: +To run the application in linux environment, issue the following command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/dist_app.rst b/doc/guides/sample_app_ug/dist_app.rst index 1f68d081cf..abfdd2c5e1 100644 --- a/doc/guides/sample_app_ug/dist_app.rst +++ b/doc/guides/sample_app_ug/dist_app.rst @@ -46,7 +46,7 @@ Running the Application * -p PORTMASK: Hexadecimal bitmask of ports to configure -#. To run the application in linuxapp environment with 10 lcores, 4 ports, +#. To run the application in linux environment with 10 lcores, 4 ports, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index aeacfacb7c..2953fddeb9 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -112,7 +112,7 @@ where, are folder paths. -To run the application in linuxapp environment to test one AES FIPS test data +To run the application in linux environment to test one AES FIPS test data file for crypto_aesni_mb PMD, issue the command: .. code-block:: console @@ -121,7 +121,7 @@ file for crypto_aesni_mb PMD, issue the command: --req-file /PATH/TO/REQUEST/FILE.req --rsp-file ./PATH/TO/RESPONSE/FILE.rsp --cryptodev crypto_aesni_mb -To run the application in linuxapp environment to test all AES-GCM FIPS test +To run the application in linux environment to test all AES-GCM FIPS test data files in one folder for crypto_aesni_gcm PMD, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/flow_classify.rst b/doc/guides/sample_app_ug/flow_classify.rst index 003ed03562..a6383b3c70 100644 --- a/doc/guides/sample_app_ug/flow_classify.rst +++ b/doc/guides/sample_app_ug/flow_classify.rst @@ -24,7 +24,7 @@ The application is located in the ``flow_classify`` sub-directory. Running the Application ----------------------- -To run the example in a ``linuxapp`` environment: +To run the example in a ``linux`` environment: .. code-block:: console diff --git a/doc/guides/sample_app_ug/flow_filtering.rst b/doc/guides/sample_app_ug/flow_filtering.rst index 9dba85acff..be3d63f904 100644 --- a/doc/guides/sample_app_ug/flow_filtering.rst +++ b/doc/guides/sample_app_ug/flow_filtering.rst @@ -26,7 +26,7 @@ Set the target, for example: .. code-block:: console - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started* Guide for possible ``RTE_TARGET`` values. @@ -40,7 +40,7 @@ Build the application as follows: Running the Application ----------------------- -To run the example in a ``linuxapp`` environment: +To run the example in a ``linux`` environment: .. code-block:: console diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst index a2051f7998..c0e0a1549e 100644 --- a/doc/guides/sample_app_ug/hello_world.rst +++ b/doc/guides/sample_app_ug/hello_world.rst @@ -17,7 +17,7 @@ The application is located in the ``helloworld`` sub-directory. Running the Application ----------------------- -To run the example in a linuxapp environment: +To run the example in a linux environment: .. code-block:: console @@ -48,7 +48,7 @@ This is done in the main() function using the following code: if (ret < 0) rte_panic("Cannot init EAL\n"); -This call finishes the initialization process that was started before main() is called (in case of a Linuxapp environment). +This call finishes the initialization process that was started before main() is called (in case of a Linux environment). The argc and argv arguments are provided to the rte_eal_init() function. The value returned is the number of parsed arguments. diff --git a/doc/guides/sample_app_ug/ip_frag.rst b/doc/guides/sample_app_ug/ip_frag.rst index 7914a977a4..2583f0c3d0 100644 --- a/doc/guides/sample_app_ug/ip_frag.rst +++ b/doc/guides/sample_app_ug/ip_frag.rst @@ -61,7 +61,7 @@ where: * -q NQ is the number of queue (=ports) per lcore (the default is 1) -To run the example in linuxapp environment with 2 lcores (2,4) over 2 ports(0,2) with 1 RX queue per lcore: +To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) with 1 RX queue per lcore: .. code-block:: console @@ -90,7 +90,7 @@ To run the example in linuxapp environment with 2 lcores (2,4) over 2 ports(0,2) IP_FRAG: entering main loop on lcore 2 IP_FRAG: -- lcoreid=2 portid=0 -To run the example in linuxapp environment with 1 lcore (4) over 2 ports(0,2) with 2 RX queues per lcore: +To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with 2 RX queues per lcore: .. code-block:: console diff --git a/doc/guides/sample_app_ug/ip_reassembly.rst b/doc/guides/sample_app_ug/ip_reassembly.rst index e1b56d7be4..a628b63cb8 100644 --- a/doc/guides/sample_app_ug/ip_reassembly.rst +++ b/doc/guides/sample_app_ug/ip_reassembly.rst @@ -57,7 +57,7 @@ where: then they are considered as invalid and will be dropped. Valid range is 1ms - 3600s. Default value: 1s. -To run the example in linuxapp environment with 2 lcores (2,4) over 2 ports(0,2) with 1 RX queue per lcore: +To run the example in linux environment with 2 lcores (2,4) over 2 ports(0,2) with 1 RX queue per lcore: .. code-block:: console @@ -88,7 +88,7 @@ To run the example in linuxapp environment with 2 lcores (2,4) over 2 ports(0,2) IP_RSMBL: entering main loop on lcore 2 IP_RSMBL: -- lcoreid=2 portid=0 -To run the example in linuxapp environment with 1 lcore (4) over 2 ports(0,2) with 2 RX queues per lcore: +To run the example in linux environment with 1 lcore (4) over 2 ports(0,2) with 2 RX queues per lcore: .. code-block:: console diff --git a/doc/guides/sample_app_ug/keep_alive.rst b/doc/guides/sample_app_ug/keep_alive.rst index 5ceaa442d6..865ba69e5c 100644 --- a/doc/guides/sample_app_ug/keep_alive.rst +++ b/doc/guides/sample_app_ug/keep_alive.rst @@ -63,7 +63,7 @@ where, * ``T PERIOD``: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default, 86400 maximum). -To run the application in linuxapp environment with 4 lcores, 16 ports +To run the application in linux environment with 4 lcores, 16 ports 8 RX queues per lcore and a ping interval of 10ms, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/kernel_nic_interface.rst b/doc/guides/sample_app_ug/kernel_nic_interface.rst index 6acdf0fff0..f8fe17bd08 100644 --- a/doc/guides/sample_app_ug/kernel_nic_interface.rst +++ b/doc/guides/sample_app_ug/kernel_nic_interface.rst @@ -87,7 +87,7 @@ The application is located in the ``examples/kni`` sub-directory. .. note:: - This application is intended as a linuxapp only. + This application is intended as a linux only. Running the kni Example Application ----------------------------------- diff --git a/doc/guides/sample_app_ug/l2_forward_cat.rst b/doc/guides/sample_app_ug/l2_forward_cat.rst index 4ee877b4d4..0a813200ba 100644 --- a/doc/guides/sample_app_ug/l2_forward_cat.rst +++ b/doc/guides/sample_app_ug/l2_forward_cat.rst @@ -66,7 +66,7 @@ The application is located in the ``l2fwd-cat`` sub-directory. Running the Application ----------------------- -To run the example in a ``linuxapp`` environment and enable CAT on cpus 0-2: +To run the example in a ``linux`` environment and enable CAT on cpus 0-2: .. code-block:: console diff --git a/doc/guides/sample_app_ug/l2_forward_crypto.rst b/doc/guides/sample_app_ug/l2_forward_crypto.rst index 855afd8fc6..e8d52dad2b 100644 --- a/doc/guides/sample_app_ug/l2_forward_crypto.rst +++ b/doc/guides/sample_app_ug/l2_forward_crypto.rst @@ -158,7 +158,7 @@ the specified crypto operation are available on application initialization. This means that HW crypto device/s must be bound to a DPDK driver or a SW crypto device/s (virtual crypto PMD) must be created (using --vdev). -To run the application in linuxapp environment with 2 lcores, 2 ports and 2 crypto devices, issue the command: +To run the application in linux environment with 2 lcores, 2 ports and 2 crypto devices, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/l2_forward_job_stats.rst b/doc/guides/sample_app_ug/l2_forward_job_stats.rst index ba73d85579..dfc1ed9ca0 100644 --- a/doc/guides/sample_app_ug/l2_forward_job_stats.rst +++ b/doc/guides/sample_app_ug/l2_forward_job_stats.rst @@ -91,7 +91,7 @@ where, * l: Use locale thousands separator when formatting big numbers. -To run the application in linuxapp environment with 4 lcores, 16 ports, 8 RX queues per lcore and +To run the application in linux environment with 4 lcores, 16 ports, 8 RX queues per lcore and thousands separator printing, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst index 2b2d5afa07..e5b28e425e 100644 --- a/doc/guides/sample_app_ug/l2_forward_real_virtual.rst +++ b/doc/guides/sample_app_ug/l2_forward_real_virtual.rst @@ -101,7 +101,7 @@ where, * --[no-]mac-updating: Enable or disable MAC addresses updating (enabled by default). -To run the application in linuxapp environment with 4 lcores, 16 ports and 8 RX queues per lcore and MAC address +To run the application in linux environment with 4 lcores, 16 ports and 8 RX queues per lcore and MAC address updating enabled, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/link_status_intr.rst b/doc/guides/sample_app_ug/link_status_intr.rst index 695c088e88..571cd2d605 100644 --- a/doc/guides/sample_app_ug/link_status_intr.rst +++ b/doc/guides/sample_app_ug/link_status_intr.rst @@ -49,7 +49,7 @@ where, * -T PERIOD: statistics will be refreshed each PERIOD seconds (0 to disable, 10 default) -To run the application in a linuxapp environment with 4 lcores, 4 memory channels, 16 ports and 8 RX queues per lcore, +To run the application in a linux environment with 4 lcores, 4 memory channels, 16 ports and 8 RX queues per lcore, issue the command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/netmap_compatibility.rst b/doc/guides/sample_app_ug/netmap_compatibility.rst index 33b1cc214f..219613e2aa 100644 --- a/doc/guides/sample_app_ug/netmap_compatibility.rst +++ b/doc/guides/sample_app_ug/netmap_compatibility.rst @@ -117,7 +117,7 @@ where, If two ``-i`` parameters are given, the two interfaces form a bridge, where traffic received on one interface is replicated and sent to the other interface. -For example, to run the application in a linuxapp environment using port 0 and 2: +For example, to run the application in a linux environment using port 0 and 2: .. code-block:: console diff --git a/doc/guides/sample_app_ug/performance_thread.rst b/doc/guides/sample_app_ug/performance_thread.rst index fbd30a5ea4..e2c04efcc0 100644 --- a/doc/guides/sample_app_ug/performance_thread.rst +++ b/doc/guides/sample_app_ug/performance_thread.rst @@ -1158,7 +1158,7 @@ To build and run the pthread shim example .. code-block:: console - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc See the DPDK Getting Started Guide for possible RTE_TARGET values. diff --git a/doc/guides/sample_app_ug/ptpclient.rst b/doc/guides/sample_app_ug/ptpclient.rst index 53de50374e..9d7446d5f9 100644 --- a/doc/guides/sample_app_ug/ptpclient.rst +++ b/doc/guides/sample_app_ug/ptpclient.rst @@ -58,7 +58,7 @@ To compile the sample application see :doc:`compiling`. The application is located in the ``ptpclient`` sub-directory. .. note:: - To compile the application edit the ``config/common_linuxapp`` configuration file to enable IEEE1588 + To compile the application edit the ``config/common_linux`` configuration file to enable IEEE1588 and then recompile DPDK: .. code-block:: console @@ -68,7 +68,7 @@ The application is located in the ``ptpclient`` sub-directory. Running the Application ----------------------- -To run the example in a ``linuxapp`` environment: +To run the example in a ``linux`` environment: .. code-block:: console diff --git a/doc/guides/sample_app_ug/qos_scheduler.rst b/doc/guides/sample_app_ug/qos_scheduler.rst index d6c3bc6c79..cdd29d90c3 100644 --- a/doc/guides/sample_app_ug/qos_scheduler.rst +++ b/doc/guides/sample_app_ug/qos_scheduler.rst @@ -37,7 +37,7 @@ The application is located in the ``qos_sched`` sub-directory. .. note:: - This application is intended as a linuxapp only. + This application is intended as a linux only. .. note:: diff --git a/doc/guides/sample_app_ug/quota_watermark.rst b/doc/guides/sample_app_ug/quota_watermark.rst index 67200e15d7..125e6fb73a 100644 --- a/doc/guides/sample_app_ug/quota_watermark.rst +++ b/doc/guides/sample_app_ug/quota_watermark.rst @@ -88,7 +88,7 @@ where, -p PORTMASK: A hexadecimal bitmask of the ports to configure -To run the application in a linuxapp environment with four logical cores and ports 0 and 2, +To run the application in a linux environment with four logical cores and ports 0 and 2, issue the following command: .. code-block:: console @@ -110,7 +110,7 @@ The control application requires a number of command line options: The --proc-type=secondary option is necessary for the EAL to properly initialize the control application to use the same huge pages as the core application and thus be able to access its rings. -To run the application in a linuxapp environment on logical core 0, issue the following command: +To run the application in a linux environment on logical core 0, issue the following command: .. code-block:: console diff --git a/doc/guides/sample_app_ug/rxtx_callbacks.rst b/doc/guides/sample_app_ug/rxtx_callbacks.rst index 85d96d8a2d..81463d28da 100644 --- a/doc/guides/sample_app_ug/rxtx_callbacks.rst +++ b/doc/guides/sample_app_ug/rxtx_callbacks.rst @@ -32,7 +32,7 @@ target. This is generally on by default: Running the Application ----------------------- -To run the example in a ``linuxapp`` environment: +To run the example in a ``linux`` environment: .. code-block:: console diff --git a/doc/guides/sample_app_ug/service_cores.rst b/doc/guides/sample_app_ug/service_cores.rst index b8339e70bc..cd0f4717aa 100644 --- a/doc/guides/sample_app_ug/service_cores.rst +++ b/doc/guides/sample_app_ug/service_cores.rst @@ -31,7 +31,7 @@ Compiling the Application .. code-block:: console - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc See the *DPDK Getting Started* Guide for possible RTE_TARGET values. diff --git a/doc/guides/sample_app_ug/skeleton.rst b/doc/guides/sample_app_ug/skeleton.rst index 959561716f..11ee521b3c 100644 --- a/doc/guides/sample_app_ug/skeleton.rst +++ b/doc/guides/sample_app_ug/skeleton.rst @@ -21,7 +21,7 @@ The application is located in the ``skeleton`` sub-directory. Running the Application ----------------------- -To run the example in a ``linuxapp`` environment: +To run the example in a ``linux`` environment: .. code-block:: console diff --git a/doc/guides/sample_app_ug/tep_termination.rst b/doc/guides/sample_app_ug/tep_termination.rst index b3332977b8..df159355d6 100644 --- a/doc/guides/sample_app_ug/tep_termination.rst +++ b/doc/guides/sample_app_ug/tep_termination.rst @@ -94,7 +94,7 @@ Compiling the Sample Code ------------------------- To enable vhost, turn on vhost library in the configure file -``config/common_linuxapp``. +``config/common_linux``. .. code-block:: console diff --git a/doc/guides/sample_app_ug/timer.rst b/doc/guides/sample_app_ug/timer.rst index d87a7abc1e..87dfb4c1f4 100644 --- a/doc/guides/sample_app_ug/timer.rst +++ b/doc/guides/sample_app_ug/timer.rst @@ -17,7 +17,7 @@ The application is located in the ``timer`` sub-directory. Running the Application ----------------------- -To run the example in linuxapp environment: +To run the example in linux environment: .. code-block:: console diff --git a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst index 0e9da9707a..707afe91a5 100644 --- a/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +++ b/doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst @@ -68,7 +68,7 @@ The application is located in the ``vmdq_dcb`` sub-directory. Running the Application ----------------------- -To run the example in a linuxapp environment: +To run the example in a linux environment: .. code-block:: console @@ -250,7 +250,7 @@ See :doc:`l2_forward_real_virtual` for more information. Statistics Display ~~~~~~~~~~~~~~~~~~ -When run in a linuxapp environment, +When run in a linux environment, the VMDQ and DCB Forwarding sample application can display statistics showing the number of packets read from each RX queue. This is provided by way of a signal handler for the SIGHUP signal, which simply prints to standard output the packet counts in grid form. diff --git a/doc/guides/testpmd_app_ug/build_app.rst b/doc/guides/testpmd_app_ug/build_app.rst index 45a8395e03..d1ca9f3d19 100644 --- a/doc/guides/testpmd_app_ug/build_app.rst +++ b/doc/guides/testpmd_app_ug/build_app.rst @@ -19,7 +19,7 @@ The basic compilation steps are: .. code-block:: console - export RTE_TARGET=x86_64-native-linuxapp-gcc + export RTE_TARGET=x86_64-native-linux-gcc #. Build the application: diff --git a/doc/guides/tools/testbbdev.rst b/doc/guides/tools/testbbdev.rst index 5caa902391..f3386472d8 100644 --- a/doc/guides/tools/testbbdev.rst +++ b/doc/guides/tools/testbbdev.rst @@ -227,7 +227,7 @@ Running Tests ------------- Shortened tree of isg_cid-wireless_dpdk_ae with dpdk compiled for -x86_64-native-linuxapp-icc target: +x86_64-native-linux-icc target: :: @@ -256,7 +256,7 @@ x86_64-native-linuxapp-icc target: |-- turbo_enc_c1_k40_r0_e1194_rm.data |-- turbo_enc_c1_k6144_r0_e32256_crc24b_rm.data - |-- x86_64-native-linuxapp-icc + |-- x86_64-native-linux-icc |-- app |-- testbbdev @@ -265,7 +265,7 @@ All bbdev devices .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linuxapp-icc/app/testbbdev + ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev -v turbo_dec_default.data It runs all available tests using the test vector filled based on @@ -279,7 +279,7 @@ baseband turbo_sw device .. code-block:: console - ./test-bbdev.py -p ../../x86_64-native-linuxapp-icc/app/testbbdev + ./test-bbdev.py -p ../../x86_64-native-linux-icc/app/testbbdev -e="--vdev=baseband_turbo_sw" -t 120 -c validation -v ./test_vectors/turbo_* -n 64 -b 8 32 diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile index 484e76cd6c..64885dd86a 100644 --- a/drivers/net/softnic/Makefile +++ b/drivers/net/softnic/Makefile @@ -46,7 +46,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c SYMLINK-y-include += rte_eth_softnic.h ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") -$(info Softnic PMD can only operate in a linuxapp environment, \ +$(info Softnic PMD can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: clean: diff --git a/examples/Makefile b/examples/Makefile index 33fe0e586d..c7a81f08de 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/bbdev_app/Makefile b/examples/bbdev_app/Makefile index 18dd99db2e..51abf82cf8 100644 --- a/examples/bbdev_app/Makefile +++ b/examples/bbdev_app/Makefile @@ -46,7 +46,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/bond/Makefile b/examples/bond/Makefile index d6e500aab0..98a31d6b59 100644 --- a/examples/bond/Makefile +++ b/examples/bond/Makefile @@ -48,7 +48,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/cmdline/Makefile b/examples/cmdline/Makefile index a617cce115..30a87626e9 100644 --- a/examples/cmdline/Makefile +++ b/examples/cmdline/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/distributor/Makefile b/examples/distributor/Makefile index 05ea0bfecb..0cda58a5be 100644 --- a/examples/distributor/Makefile +++ b/examples/distributor/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile index 70a4f5dc9a..27908bb63b 100644 --- a/examples/ethtool/Makefile +++ b/examples/ethtool/Makefile @@ -6,12 +6,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overwritten by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) else diff --git a/examples/ethtool/ethtool-app/Makefile b/examples/ethtool/ethtool-app/Makefile index 9ecfc0b893..0dae20383d 100644 --- a/examples/ethtool/ethtool-app/Makefile +++ b/examples/ethtool/ethtool-app/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile index ee83b8769b..70e00eee8b 100644 --- a/examples/ethtool/lib/Makefile +++ b/examples/ethtool/lib/Makefile @@ -6,12 +6,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overwritten by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linuxapp environment, \ +$(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/eventdev_pipeline/Makefile b/examples/eventdev_pipeline/Makefile index 1a789ccc36..238c41ea29 100644 --- a/examples/eventdev_pipeline/Makefile +++ b/examples/eventdev_pipeline/Makefile @@ -48,7 +48,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/exception_path/Makefile b/examples/exception_path/Makefile index ae74781ec7..1f08792ee8 100644 --- a/examples/exception_path/Makefile +++ b/examples/exception_path/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/fips_validation/Makefile b/examples/fips_validation/Makefile index a7170d8097..923d0be6e4 100644 --- a/examples/fips_validation/Makefile +++ b/examples/fips_validation/Makefile @@ -52,7 +52,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc INC += $(sort $(wildcard *.h)) diff --git a/examples/flow_classify/Makefile b/examples/flow_classify/Makefile index f1fa4df624..3a49f971cc 100644 --- a/examples/flow_classify/Makefile +++ b/examples/flow_classify/Makefile @@ -46,7 +46,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/flow_filtering/Makefile b/examples/flow_filtering/Makefile index 8f86b7b24b..cc51ffdb84 100644 --- a/examples/flow_filtering/Makefile +++ b/examples/flow_filtering/Makefile @@ -42,7 +42,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/helloworld/Makefile b/examples/helloworld/Makefile index d66b526b6f..0b5374d037 100644 --- a/examples/helloworld/Makefile +++ b/examples/helloworld/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ip_fragmentation/Makefile b/examples/ip_fragmentation/Makefile index 9e89e744c6..fd186406c2 100644 --- a/examples/ip_fragmentation/Makefile +++ b/examples/ip_fragmentation/Makefile @@ -45,7 +45,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 8b1744d0d0..26d2c71b0e 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -64,12 +64,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: clean: diff --git a/examples/ip_reassembly/Makefile b/examples/ip_reassembly/Makefile index 1e81315f2a..672ffe3841 100644 --- a/examples/ip_reassembly/Makefile +++ b/examples/ip_reassembly/Makefile @@ -45,7 +45,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ipsec-secgw/Makefile b/examples/ipsec-secgw/Makefile index 08f474da61..0236a74bf9 100644 --- a/examples/ipsec-secgw/Makefile +++ b/examples/ipsec-secgw/Makefile @@ -57,7 +57,7 @@ ifeq ($(RTE_SDK),) endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ipsec-secgw/test/common_defs.sh b/examples/ipsec-secgw/test/common_defs.sh index 1ed31f89f0..693c70cd1f 100644 --- a/examples/ipsec-secgw/test/common_defs.sh +++ b/examples/ipsec-secgw/test/common_defs.sh @@ -45,7 +45,7 @@ REMOTE_IPV6=fd12:3456:789a:0031:0000:0000:0000:0014 LOCAL_IPV6=fd12:3456:789a:0031:0000:0000:0000:0092 DPDK_PATH=${RTE_SDK:-${PWD}} -DPDK_BUILD=${RTE_TARGET:-x86_64-native-linuxapp-gcc} +DPDK_BUILD=${RTE_TARGET:-x86_64-native-linux-gcc} SGW_OUT_FILE=./ipsec-secgw.out1 diff --git a/examples/ipv4_multicast/Makefile b/examples/ipv4_multicast/Makefile index a16c623332..ea7339aa97 100644 --- a/examples/ipv4_multicast/Makefile +++ b/examples/ipv4_multicast/Makefile @@ -45,7 +45,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/kni/Makefile b/examples/kni/Makefile index 096ec4d975..e6d897f94a 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -45,12 +45,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linuxapp environment, \ +$(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile index b6eeabde1a..111247edb0 100644 --- a/examples/l2fwd-cat/Makefile +++ b/examples/l2fwd-cat/Makefile @@ -50,7 +50,7 @@ $(error "Please define PQOS_INSTALL_PATH environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l2fwd-crypto/Makefile b/examples/l2fwd-crypto/Makefile index 229fc2a89b..84249a5cb3 100644 --- a/examples/l2fwd-crypto/Makefile +++ b/examples/l2fwd-crypto/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l2fwd-jobstats/Makefile b/examples/l2fwd-jobstats/Makefile index 696a8b21a4..cacec916e7 100644 --- a/examples/l2fwd-jobstats/Makefile +++ b/examples/l2fwd-jobstats/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l2fwd-keepalive/Makefile b/examples/l2fwd-keepalive/Makefile index 4ab67db44e..3d3f28e683 100644 --- a/examples/l2fwd-keepalive/Makefile +++ b/examples/l2fwd-keepalive/Makefile @@ -46,7 +46,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l2fwd-keepalive/ka-agent/Makefile b/examples/l2fwd-keepalive/ka-agent/Makefile index ddb6e83f6a..005b72c631 100644 --- a/examples/l2fwd-keepalive/ka-agent/Makefile +++ b/examples/l2fwd-keepalive/ka-agent/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l2fwd/Makefile b/examples/l2fwd/Makefile index a8a47ad4e2..30866015b3 100644 --- a/examples/l2fwd/Makefile +++ b/examples/l2fwd/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l3fwd-acl/Makefile b/examples/l3fwd-acl/Makefile index 285683f833..294c1f1010 100644 --- a/examples/l3fwd-acl/Makefile +++ b/examples/l3fwd-acl/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 61f151c125..4c768380c3 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -46,12 +46,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: else diff --git a/examples/l3fwd-vf/Makefile b/examples/l3fwd-vf/Makefile index dfb1d52d36..90f4f7fb3d 100644 --- a/examples/l3fwd-vf/Makefile +++ b/examples/l3fwd-vf/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/l3fwd/Makefile b/examples/l3fwd/Makefile index cccdd9dfaa..9fa7a448ec 100644 --- a/examples/l3fwd/Makefile +++ b/examples/l3fwd/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/link_status_interrupt/Makefile b/examples/link_status_interrupt/Makefile index 1606821232..65773f8c4d 100644 --- a/examples/link_status_interrupt/Makefile +++ b/examples/link_status_interrupt/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/load_balancer/Makefile b/examples/load_balancer/Makefile index 197b019d58..280dfa97e0 100644 --- a/examples/load_balancer/Makefile +++ b/examples/load_balancer/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index 4514014a08..b0633df38f 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index 76f895175e..f199faf1fa 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index 09ee270c01..ac18822b07 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -6,12 +6,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linuxapp environment, \ +$(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/multi_process/hotplug_mp/Makefile b/examples/multi_process/hotplug_mp/Makefile index bc36aeaed7..b5babf6857 100644 --- a/examples/multi_process/hotplug_mp/Makefile +++ b/examples/multi_process/hotplug_mp/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/simple_mp/Makefile b/examples/multi_process/simple_mp/Makefile index fba9c86827..6657538a4e 100644 --- a/examples/multi_process/simple_mp/Makefile +++ b/examples/multi_process/simple_mp/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/multi_process/symmetric_mp/Makefile b/examples/multi_process/symmetric_mp/Makefile index 6fb9cc3663..9226690b16 100644 --- a/examples/multi_process/symmetric_mp/Makefile +++ b/examples/multi_process/symmetric_mp/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/netmap_compat/Makefile b/examples/netmap_compat/Makefile index dd87ac9bd7..f2bf39e691 100644 --- a/examples/netmap_compat/Makefile +++ b/examples/netmap_compat/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk unexport RTE_SRCDIR RTE_OUTPUT RTE_EXTMK diff --git a/examples/netmap_compat/bridge/Makefile b/examples/netmap_compat/bridge/Makefile index 4c8981acbe..3e3ff0795e 100644 --- a/examples/netmap_compat/bridge/Makefile +++ b/examples/netmap_compat/bridge/Makefile @@ -6,12 +6,12 @@ $(error "Please define the RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: clean: diff --git a/examples/packet_ordering/Makefile b/examples/packet_ordering/Makefile index 3cf1ee1dc3..16781e7620 100644 --- a/examples/packet_ordering/Makefile +++ b/examples/packet_ordering/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/performance-thread/Makefile b/examples/performance-thread/Makefile index 792ac661e3..d63fcbbb99 100644 --- a/examples/performance-thread/Makefile +++ b/examples/performance-thread/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/performance-thread/l3fwd-thread/Makefile b/examples/performance-thread/l3fwd-thread/Makefile index 5558043f2a..7bc0fef824 100644 --- a/examples/performance-thread/l3fwd-thread/Makefile +++ b/examples/performance-thread/l3fwd-thread/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/performance-thread/pthread_shim/Makefile b/examples/performance-thread/pthread_shim/Makefile index a6d276a49e..731aef6379 100644 --- a/examples/performance-thread/pthread_shim/Makefile +++ b/examples/performance-thread/pthread_shim/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/ptpclient/Makefile b/examples/ptpclient/Makefile index 989e2dd40c..99c817ffd5 100644 --- a/examples/ptpclient/Makefile +++ b/examples/ptpclient/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overriddegitn by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/qos_meter/Makefile b/examples/qos_meter/Makefile index 46341b1a73..fe44e64184 100644 --- a/examples/qos_meter/Makefile +++ b/examples/qos_meter/Makefile @@ -46,7 +46,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index e0d298345b..44df68ab82 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -44,12 +44,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: clean: diff --git a/examples/quota_watermark/Makefile b/examples/quota_watermark/Makefile index ec7d989ae3..6a20cba0c1 100644 --- a/examples/quota_watermark/Makefile +++ b/examples/quota_watermark/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/quota_watermark/qw/Makefile b/examples/quota_watermark/qw/Makefile index 84299e5945..9971acc41b 100644 --- a/examples/quota_watermark/qw/Makefile +++ b/examples/quota_watermark/qw/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/quota_watermark/qwctl/Makefile b/examples/quota_watermark/qwctl/Makefile index b390128e78..b3640f7d4e 100644 --- a/examples/quota_watermark/qwctl/Makefile +++ b/examples/quota_watermark/qwctl/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/rxtx_callbacks/Makefile b/examples/rxtx_callbacks/Makefile index e9d30d56f3..5154089de4 100644 --- a/examples/rxtx_callbacks/Makefile +++ b/examples/rxtx_callbacks/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile index de90253fe1..0e0896609b 100644 --- a/examples/server_node_efd/Makefile +++ b/examples/server_node_efd/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index 1ca958abbb..2906261dde 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -6,12 +6,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linuxapp environment, \ +$(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/service_cores/Makefile b/examples/service_cores/Makefile index a4d6b7b448..d38acd53a4 100644 --- a/examples/service_cores/Makefile +++ b/examples/service_cores/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/skeleton/Makefile b/examples/skeleton/Makefile index bd980ec9bb..5e2742ec60 100644 --- a/examples/skeleton/Makefile +++ b/examples/skeleton/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 44af6ca525..f5303bacbb 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -48,12 +48,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(error This application can only operate in a linuxapp environment, \ +$(error This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/timer/Makefile b/examples/timer/Makefile index 42b23f28e3..daed94d29b 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vdpa/Makefile b/examples/vdpa/Makefile index 42672a2bcb..b28378f0c8 100644 --- a/examples/vdpa/Makefile +++ b/examples/vdpa/Makefile @@ -6,12 +6,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp") -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: else diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index 540ccaaee6..d58d002bae 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -48,12 +48,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: else diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index 719cc5595a..80403a5e9a 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -6,12 +6,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: else diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile index 3392d24b2c..58ff7a25ca 100644 --- a/examples/vhost_scsi/Makefile +++ b/examples/vhost_scsi/Makefile @@ -47,12 +47,12 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) -$(info This application can only operate in a linuxapp environment, \ +$(info This application can only operate in a linux environment, \ please change the definition of the RTE_TARGET environment variable) all: else diff --git a/examples/vm_power_manager/Makefile b/examples/vm_power_manager/Makefile index 50147c05d3..e608bb61a9 100644 --- a/examples/vm_power_manager/Makefile +++ b/examples/vm_power_manager/Makefile @@ -10,7 +10,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vm_power_manager/guest_cli/Makefile b/examples/vm_power_manager/guest_cli/Makefile index 8b1db861e0..a5634eacfa 100644 --- a/examples/vm_power_manager/guest_cli/Makefile +++ b/examples/vm_power_manager/guest_cli/Makefile @@ -6,7 +6,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vmdq/Makefile b/examples/vmdq/Makefile index 87abeab93d..09ff070a85 100644 --- a/examples/vmdq/Makefile +++ b/examples/vmdq/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/examples/vmdq_dcb/Makefile b/examples/vmdq_dcb/Makefile index bf161cb2b8..436ccb9c10 100644 --- a/examples/vmdq_dcb/Makefile +++ b/examples/vmdq_dcb/Makefile @@ -44,7 +44,7 @@ $(error "Please define RTE_SDK environment variable") endif # Default target, can be overridden by command line or environment -RTE_TARGET ?= x86_64-native-linuxapp-gcc +RTE_TARGET ?= x86_64-native-linux-gcc include $(RTE_SDK)/mk/rte.vars.mk diff --git a/lib/librte_eal/common/include/rte_debug.h b/lib/librte_eal/common/include/rte_debug.h index 272df494c3..748d32c80f 100644 --- a/lib/librte_eal/common/include/rte_debug.h +++ b/lib/librte_eal/common/include/rte_debug.h @@ -39,7 +39,7 @@ void rte_dump_registers(void); * * Display the format string and its expanded arguments (printf-like). * - * In a linuxapp environment, this function dumps the stack and calls + * In a linux environment, this function dumps the stack and calls * abort() resulting in a core dump if enabled. * * The function never returns. diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h index a0cedd5738..833433229b 100644 --- a/lib/librte_eal/common/include/rte_eal.h +++ b/lib/librte_eal/common/include/rte_eal.h @@ -41,7 +41,7 @@ enum rte_lcore_role_t { }; /** - * The type of process in a linuxapp, multi-process setup + * The type of process in a linux, multi-process setup */ enum rte_proc_type_t { RTE_PROC_AUTO = -1, /* allow auto-detection of primary/secondary */ diff --git a/lib/librte_eal/freebsd/eal/Makefile b/lib/librte_eal/freebsd/eal/Makefile index aa4b9ef8e7..8e9450c26f 100644 --- a/lib/librte_eal/freebsd/eal/Makefile +++ b/lib/librte_eal/freebsd/eal/Makefile @@ -24,7 +24,7 @@ EXPORT_MAP := ../../rte_eal_version.map LIBABIVER := 9 -# specific to bsdapp exec-env +# specific to freebsd exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) := eal.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_cpuflags.c SRCS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal_memory.c @@ -86,7 +86,7 @@ CFLAGS_eal_thread.o += -Wno-return-type CFLAGS_eal_hpet.o += -Wno-return-type endif -INC := # no bsdapp specific headers +INC := # no bsd specific headers SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include/exec-env := \ $(addprefix include/exec-env/,$(INC)) diff --git a/lib/librte_eal/linux/eal/Makefile b/lib/librte_eal/linux/eal/Makefile index 9e32f1174e..e5e668cd00 100644 --- a/lib/librte_eal/linux/eal/Makefile +++ b/lib/librte_eal/linux/eal/Makefile @@ -29,7 +29,7 @@ ifeq ($(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),y) LDLIBS += -lnuma endif -# specific to linuxapp exec-env +# specific to linux exec-env SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c diff --git a/mk/exec-env/bsdapp b/mk/exec-env/bsdapp new file mode 120000 index 0000000000..69f5cba2c2 --- /dev/null +++ b/mk/exec-env/bsdapp @@ -0,0 +1 @@ +freebsd/ \ No newline at end of file diff --git a/mk/exec-env/bsdapp/rte.app.mk b/mk/exec-env/bsdapp/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/bsdapp/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/bsdapp/rte.vars.mk b/mk/exec-env/bsdapp/rte.vars.mk deleted file mode 100644 index cec08840b3..0000000000 --- a/mk/exec-env/bsdapp/rte.vars.mk +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linuxapp, bsdapp -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -EXECENV_LDFLAGS = -EXECENV_LDLIBS = -lexecinfo -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -BSDMAKE=/usr/bin/make - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS diff --git a/mk/exec-env/freebsd/rte.app.mk b/mk/exec-env/freebsd/rte.app.mk new file mode 100644 index 0000000000..a2af7266a6 --- /dev/null +++ b/mk/exec-env/freebsd/rte.app.mk @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation + +exec-env-appinstall: + @true + +exec-env-appclean: + @true diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk new file mode 100644 index 0000000000..c6be560b3d --- /dev/null +++ b/mk/exec-env/freebsd/rte.vars.mk @@ -0,0 +1,33 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation + +# +# exec-env: +# +# - define EXECENV_CFLAGS variable (overridden by cmdline) +# - define EXECENV_LDFLAGS variable (overridden by cmdline) +# - define EXECENV_ASFLAGS variable (overridden by cmdline) +# - may override any previously defined variable +# +# examples for RTE_EXEC_ENV: linux, freebsd +# +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) +EXECENV_CFLAGS = -pthread -fPIC +else +EXECENV_CFLAGS = -pthread +endif + +EXECENV_LDFLAGS = +EXECENV_LDLIBS = -lexecinfo +EXECENV_ASFLAGS = + +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) +EXECENV_LDLIBS += -lgcc_s +endif + +# force applications to link with gcc/icc instead of using ld +LINK_USING_CC := 1 + +BSDMAKE=/usr/bin/make + +export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS diff --git a/mk/exec-env/linux/rte.app.mk b/mk/exec-env/linux/rte.app.mk new file mode 100644 index 0000000000..a2af7266a6 --- /dev/null +++ b/mk/exec-env/linux/rte.app.mk @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation + +exec-env-appinstall: + @true + +exec-env-appclean: + @true diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk new file mode 100644 index 0000000000..d04d0e29c6 --- /dev/null +++ b/mk/exec-env/linux/rte.vars.mk @@ -0,0 +1,41 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2010-2014 Intel Corporation + +# +# exec-env: +# +# - define EXECENV_CFLAGS variable (overridden by cmdline) +# - define EXECENV_LDFLAGS variable (overridden by cmdline) +# - define EXECENV_ASFLAGS variable (overridden by cmdline) +# - may override any previously defined variable +# +# examples for RTE_EXEC_ENV: linux, freebsd +# +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) +EXECENV_CFLAGS = -pthread -fPIC +else +EXECENV_CFLAGS = -pthread +endif + +EXECENV_LDLIBS = +EXECENV_ASFLAGS = + +ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) +EXECENV_LDLIBS += -lgcc_s +endif + +EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd + +# force applications to link with gcc/icc instead of using ld +LINK_USING_CC := 1 + +# For shared libraries +EXECENV_LDFLAGS += -export-dynamic +# Add library to the group to resolve symbols +EXECENV_LDLIBS += -ldl + +# EXECENV_LDLIBS-y applies to lib.so and app linking +# while EXECENV_LDLIBS applies only to app linking. +EXECENV_LDLIBS += $(EXECENV_LDLIBS-y) + +export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS diff --git a/mk/exec-env/linuxapp b/mk/exec-env/linuxapp new file mode 120000 index 0000000000..ce5e2c77b2 --- /dev/null +++ b/mk/exec-env/linuxapp @@ -0,0 +1 @@ +linux/ \ No newline at end of file diff --git a/mk/exec-env/linuxapp/rte.app.mk b/mk/exec-env/linuxapp/rte.app.mk deleted file mode 100644 index a2af7266a6..0000000000 --- a/mk/exec-env/linuxapp/rte.app.mk +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -exec-env-appinstall: - @true - -exec-env-appclean: - @true diff --git a/mk/exec-env/linuxapp/rte.vars.mk b/mk/exec-env/linuxapp/rte.vars.mk deleted file mode 100644 index 57ee82150b..0000000000 --- a/mk/exec-env/linuxapp/rte.vars.mk +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation - -# -# exec-env: -# -# - define EXECENV_CFLAGS variable (overridden by cmdline) -# - define EXECENV_LDFLAGS variable (overridden by cmdline) -# - define EXECENV_ASFLAGS variable (overridden by cmdline) -# - may override any previously defined variable -# -# examples for RTE_EXEC_ENV: linuxapp, bsdapp -# -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_CFLAGS = -pthread -fPIC -else -EXECENV_CFLAGS = -pthread -endif - -EXECENV_LDLIBS = -EXECENV_ASFLAGS = - -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) -EXECENV_LDLIBS += -lgcc_s -endif - -EXECENV_LDLIBS-$(CONFIG_RTE_USE_LIBBSD) += -lbsd - -# force applications to link with gcc/icc instead of using ld -LINK_USING_CC := 1 - -# For shared libraries -EXECENV_LDFLAGS += -export-dynamic -# Add library to the group to resolve symbols -EXECENV_LDLIBS += -ldl - -# EXECENV_LDLIBS-y applies to lib.so and app linking -# while EXECENV_LDLIBS applies only to app linking. -EXECENV_LDLIBS += $(EXECENV_LDLIBS-y) - -export EXECENV_CFLAGS EXECENV_LDFLAGS EXECENV_ASFLAGS EXECENV_LDLIBS diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index fa77331cbb..c79bec1795 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -21,9 +21,10 @@ showversionum: $(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h); \ printf '%02d%02d\n' "$$1" "$$2" -INSTALL_CONFIGS := $(sort $(filter-out %~,\ +INSTALL_CONFIGS := $(sort $(filter-out %app-icc,$(filter-out %app-clang,\ + $(filter-out %app-gcc,$(filter-out %~,\ $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ - $(wildcard $(RTE_SRCDIR)/config/defconfig_*)))) + $(wildcard $(RTE_SRCDIR)/config/defconfig_*))))))) INSTALL_TARGETS := $(addsuffix _install,$(INSTALL_CONFIGS)) .PHONY: showconfigs @@ -53,9 +54,9 @@ defconfig: )-$(shell \ uname | awk '{ \ if ($$0 == "Linux") { \ - print "linuxapp"} \ + print "linux"} \ else { \ - print "bsdapp"} }' \ + print "freebsd"} }' \ )-$(shell \ ${CC} --version | grep -o 'cc\|gcc\|icc\|clang' | awk \ '{ \ diff --git a/mk/rte.sdkinstall.mk b/mk/rte.sdkinstall.mk index 2d34b4e5af..5c4215cd7a 100644 --- a/mk/rte.sdkinstall.mk +++ b/mk/rte.sdkinstall.mk @@ -24,6 +24,9 @@ export prefix ?= kerneldir ?= $(prefix)/kmod else ifeq ($(RTE_EXEC_ENV),linuxapp) +RTE_EXEC_ENV=linux +endif +ifeq ($(RTE_EXEC_ENV),linux) kerneldir ?= /lib/modules/$(shell uname -r)/extra/dpdk else kerneldir ?= /boot/modules diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk index d91583a631..4043a9d4e8 100644 --- a/mk/rte.sdkroot.mk +++ b/mk/rte.sdkroot.mk @@ -28,7 +28,7 @@ export BUILDING_RTE_SDK # # We can specify the configuration template when doing the "make -# config". For instance: make config T=x86_64-native-linuxapp-gcc +# config". For instance: make config T=x86_64-native-linux-gcc # RTE_CONFIG_TEMPLATE := ifdef T diff --git a/usertools/dpdk-setup.sh b/usertools/dpdk-setup.sh index 5eebbce877..d00807420f 100755 --- a/usertools/dpdk-setup.sh +++ b/usertools/dpdk-setup.sh @@ -479,7 +479,7 @@ step1_func() # step2_func() { - TITLE="Setup linuxapp environment" + TITLE="Setup linux environment" TEXT[1]="Insert IGB UIO module" FUNC[1]="load_igb_uio_module" @@ -514,7 +514,7 @@ step2_func() # step3_func() { - TITLE="Run test application for linuxapp environment" + TITLE="Run test application for linux environment" TEXT[1]="Run test application (\$RTE_TARGET/app/test)" FUNC[1]="run_test_app"