change legacy linuxapp/bsdapp names
Subsystems (7)
cover change legacy linuxapp/bsdapp names
The terms linuxapp and bsdapp are legacy names in DPDK that are equivalent to the more usual names of "linux" and "freebsd". Therefore, we can replace the instances of the "app" names with the more usual variants. The only issue in maintaining backward compatibility which can be done by preserving a) the build config filenames and b) the macros defined for the build. In both cases, new configs/macros are added while keeping the old for compatiblity.
The first 5 patches are relatively minor, internal changes, or changes for the newer meson system. Patch 6 is larger in size as it changes the make build system which has far greater use of the names linuxapp and bsdapp.
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configs
MAINTAINERS | 16 +--
app/test-bbdev/test-bbdev.py | 2 +-
app/test-bbdev/test_bbdev_vector.c | 2 +-
.../cperf_test_vector_parsing.c | 2 +-
app/test-pmd/testpmd.c | 2 +-
app/test/autotest.py | 2 +-
app/test/process.h | 4 +-
app/test/test.c | 2 +-
app/test/test_alarm.c | 2 +-
app/test/test_eal_flags.c | 34 +++---
app/test/test_eal_fs.c | 2 +-
app/test/test_errno.c | 2 +-
app/test/test_interrupts.c | 4 +-
app/test/test_kni.c | 2 +-
app/test/test_mempool.c | 2 +-
app/test/test_mp_secondary.c | 6 +-
app/test/test_pdump.c | 2 +-
app/test/test_timer_perf.c | 2 +-
app/test/test_timer_racecond.c | 2 +-
...mv8_linuxapp_gcc => arm64_armv8_linux_gcc} | 0
...aa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} | 0
...dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} | 0
..._linuxapp_gcc => arm64_thunderx_linux_gcc} | 0
...on_armv8a_linuxapp => common_armv8a_linux} | 2 +-
config/{common_bsdapp => common_freebsd} | 2 +-
config/{common_linuxapp => common_linux} | 1 +
config/defconfig_arm-armv7a-linux-gcc | 1 +
config/defconfig_arm-armv7a-linuxapp-gcc | 2 +-
config/defconfig_arm64-armv8a-linux-clang | 1 +
config/defconfig_arm64-armv8a-linux-gcc | 1 +
config/defconfig_arm64-armv8a-linuxapp-clang | 2 +-
config/defconfig_arm64-armv8a-linuxapp-gcc | 2 +-
config/defconfig_arm64-bluefield-linux-gcc | 1 +
config/defconfig_arm64-bluefield-linuxapp-gcc | 2 +-
config/defconfig_arm64-dpaa-linux-gcc | 1 +
config/defconfig_arm64-dpaa-linuxapp-gcc | 2 +-
config/defconfig_arm64-dpaa2-linux-gcc | 1 +
config/defconfig_arm64-dpaa2-linuxapp-gcc | 2 +-
config/defconfig_arm64-stingray-linux-gcc | 1 +
config/defconfig_arm64-stingray-linuxapp-gcc | 2 +-
config/defconfig_arm64-thunderx-linux-gcc | 1 +
config/defconfig_arm64-thunderx-linuxapp-gcc | 2 +-
config/defconfig_arm64-xgene1-linux-gcc | 1 +
config/defconfig_arm64-xgene1-linuxapp-gcc | 2 +-
config/defconfig_i686-native-linux-gcc | 1 +
config/defconfig_i686-native-linux-icc | 1 +
config/defconfig_i686-native-linuxapp-gcc | 2 +-
config/defconfig_i686-native-linuxapp-icc | 2 +-
config/defconfig_ppc_64-power8-linux-gcc | 1 +
config/defconfig_ppc_64-power8-linuxapp-gcc | 2 +-
config/defconfig_x86_64-native-bsdapp-clang | 2 +-
config/defconfig_x86_64-native-bsdapp-gcc | 2 +-
config/defconfig_x86_64-native-freebsd-clang | 1 +
config/defconfig_x86_64-native-freebsd-gcc | 1 +
config/defconfig_x86_64-native-linux-clang | 1 +
config/defconfig_x86_64-native-linux-gcc | 1 +
config/defconfig_x86_64-native-linux-icc | 1 +
config/defconfig_x86_64-native-linuxapp-clang | 2 +-
config/defconfig_x86_64-native-linuxapp-gcc | 2 +-
config/defconfig_x86_64-native-linuxapp-icc | 2 +-
config/defconfig_x86_x32-native-linux-gcc | 1 +
config/defconfig_x86_x32-native-linuxapp-gcc | 2 +-
config/rte_config.h | 8 ++
devtools/build-tags.sh | 12 +--
devtools/test-build.sh | 2 +-
devtools/test-meson-builds.sh | 2 +-
devtools/validate-abi.sh | 2 +-
doc/build-sdk-meson.txt | 4 +-
doc/build-sdk-quick.txt | 2 +-
doc/guides/compressdevs/octeontx.rst | 4 +-
doc/guides/contributing/design.rst | 8 +-
doc/guides/contributing/patches.rst | 14 +--
doc/guides/contributing/versioning.rst | 6 +-
doc/guides/cryptodevs/armv8.rst | 2 +-
doc/guides/cryptodevs/caam_jr.rst | 6 +-
doc/guides/cryptodevs/dpaa2_sec.rst | 2 +-
doc/guides/cryptodevs/dpaa_sec.rst | 2 +-
doc/guides/cryptodevs/openssl.rst | 2 +-
doc/guides/cryptodevs/virtio.rst | 8 +-
doc/guides/cryptodevs/zuc.rst | 2 +-
doc/guides/eventdevs/dpaa.rst | 2 +-
doc/guides/eventdevs/dpaa2.rst | 2 +-
doc/guides/eventdevs/octeontx.rst | 2 +-
doc/guides/freebsd_gsg/build_dpdk.rst | 6 +-
doc/guides/freebsd_gsg/build_sample_apps.rst | 10 +-
doc/guides/freebsd_gsg/install_from_ports.rst | 4 +-
doc/guides/freebsd_gsg/intro.rst | 4 +-
doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +-
doc/guides/howto/lm_virtio_vhost_user.rst | 4 +-
doc/guides/howto/pvp_reference_benchmark.rst | 4 +-
.../virtio_user_for_container_networking.rst | 4 +-
doc/guides/linux_gsg/build_dpdk.rst | 10 +-
doc/guides/linux_gsg/build_sample_apps.rst | 6 +-
.../linux_gsg/cross_build_dpdk_for_arm64.rst | 6 +-
doc/guides/linux_gsg/intro.rst | 4 +-
.../linux_gsg/nic_perf_intel_platform.rst | 2 +-
doc/guides/linux_gsg/quick_start.rst | 26 ++---
doc/guides/mempool/octeontx.rst | 2 +-
doc/guides/nics/build_and_test.rst | 34 +++---
doc/guides/nics/cxgbe.rst | 6 +-
doc/guides/nics/dpaa.rst | 2 +-
doc/guides/nics/enic.rst | 2 +-
doc/guides/nics/intel_vf.rst | 10 +-
doc/guides/nics/mlx5.rst | 2 +-
doc/guides/nics/mvneta.rst | 2 +-
doc/guides/nics/mvpp2.rst | 4 +-
doc/guides/nics/nfp.rst | 2 +-
doc/guides/nics/octeontx.rst | 4 +-
doc/guides/nics/softnic.rst | 4 +-
doc/guides/nics/tap.rst | 2 +-
doc/guides/nics/thunderx.rst | 4 +-
doc/guides/platform/octeontx.rst | 6 +-
doc/guides/prog_guide/build_app.rst | 4 +-
.../prog_guide/dev_kit_build_system.rst | 8 +-
.../prog_guide/dev_kit_root_make_help.rst | 6 +-
.../prog_guide/env_abstraction_layer.rst | 10 +-
.../prog_guide/ext_app_lib_make_help.rst | 4 +-
doc/guides/prog_guide/extend_dpdk.rst | 4 +-
doc/guides/prog_guide/glossary.rst | 2 +-
doc/guides/prog_guide/img/linuxapp_launch.svg | 4 +-
doc/guides/prog_guide/intro.rst | 2 +-
doc/guides/prog_guide/overview.rst | 2 +-
doc/guides/prog_guide/profile_app.rst | 2 +-
doc/guides/prog_guide/qos_framework.rst | 2 +-
doc/guides/rawdevs/dpaa2_cmdif.rst | 2 +-
doc/guides/rawdevs/dpaa2_qdma.rst | 2 +-
doc/guides/rel_notes/release_19_02.rst | 2 +-
doc/guides/rel_notes/release_2_1.rst | 2 +-
doc/guides/sample_app_ug/bbdev_app.rst | 6 +-
doc/guides/sample_app_ug/cmd_line.rst | 2 +-
doc/guides/sample_app_ug/dist_app.rst | 2 +-
doc/guides/sample_app_ug/fips_validation.rst | 4 +-
doc/guides/sample_app_ug/flow_classify.rst | 2 +-
doc/guides/sample_app_ug/flow_filtering.rst | 4 +-
doc/guides/sample_app_ug/hello_world.rst | 4 +-
doc/guides/sample_app_ug/ip_frag.rst | 4 +-
doc/guides/sample_app_ug/ip_reassembly.rst | 4 +-
doc/guides/sample_app_ug/keep_alive.rst | 2 +-
.../sample_app_ug/kernel_nic_interface.rst | 2 +-
doc/guides/sample_app_ug/l2_forward_cat.rst | 2 +-
.../sample_app_ug/l2_forward_crypto.rst | 2 +-
.../sample_app_ug/l2_forward_job_stats.rst | 2 +-
.../sample_app_ug/l2_forward_real_virtual.rst | 2 +-
doc/guides/sample_app_ug/link_status_intr.rst | 2 +-
.../sample_app_ug/netmap_compatibility.rst | 2 +-
.../sample_app_ug/performance_thread.rst | 2 +-
doc/guides/sample_app_ug/ptpclient.rst | 4 +-
doc/guides/sample_app_ug/qos_scheduler.rst | 2 +-
doc/guides/sample_app_ug/quota_watermark.rst | 4 +-
doc/guides/sample_app_ug/rxtx_callbacks.rst | 2 +-
doc/guides/sample_app_ug/service_cores.rst | 2 +-
doc/guides/sample_app_ug/skeleton.rst | 2 +-
doc/guides/sample_app_ug/tep_termination.rst | 2 +-
doc/guides/sample_app_ug/timer.rst | 2 +-
.../sample_app_ug/vmdq_dcb_forwarding.rst | 4 +-
doc/guides/testpmd_app_ug/build_app.rst | 2 +-
doc/guides/tools/testbbdev.rst | 8 +-
drivers/bus/dpaa/Makefile | 2 +-
drivers/bus/pci/Makefile | 4 +-
drivers/bus/vmbus/Makefile | 4 +-
drivers/crypto/caam_jr/Makefile | 2 +-
drivers/crypto/dpaa2_sec/Makefile | 2 +-
drivers/crypto/dpaa_sec/Makefile | 2 +-
drivers/crypto/virtio/virtio_pci.c | 2 +-
drivers/event/dpaa/Makefile | 2 +-
drivers/event/dpaa2/Makefile | 2 +-
drivers/mempool/dpaa2/Makefile | 2 +-
drivers/net/ark/Makefile | 2 +-
drivers/net/dpaa/Makefile | 2 +-
drivers/net/dpaa2/Makefile | 2 +-
drivers/net/failsafe/Makefile | 2 +-
drivers/net/failsafe/failsafe_private.h | 2 +-
drivers/net/pcap/rte_eth_pcap.c | 6 +-
drivers/net/sfc/sfc_intr.c | 2 +-
drivers/net/softnic/Makefile | 2 +-
drivers/net/softnic/rte_eth_softnic_tap.c | 4 +-
drivers/net/virtio/virtio_pci.c | 2 +-
drivers/raw/dpaa2_qdma/Makefile | 2 +-
examples/Makefile | 2 +-
examples/bbdev_app/Makefile | 2 +-
examples/bond/Makefile | 2 +-
examples/cmdline/Makefile | 2 +-
examples/distributor/Makefile | 2 +-
examples/ethtool/Makefile | 6 +-
examples/ethtool/ethtool-app/Makefile | 2 +-
examples/ethtool/lib/Makefile | 6 +-
examples/eventdev_pipeline/Makefile | 2 +-
examples/exception_path/Makefile | 2 +-
examples/exception_path/main.c | 4 +-
examples/fips_validation/Makefile | 2 +-
examples/flow_classify/Makefile | 2 +-
examples/flow_filtering/Makefile | 2 +-
examples/helloworld/Makefile | 2 +-
examples/ip_fragmentation/Makefile | 2 +-
examples/ip_pipeline/Makefile | 6 +-
examples/ip_pipeline/tap.c | 4 +-
examples/ip_reassembly/Makefile | 2 +-
examples/ipsec-secgw/Makefile | 2 +-
examples/ipsec-secgw/test/common_defs.sh | 2 +-
examples/ipv4_multicast/Makefile | 2 +-
examples/kni/Makefile | 6 +-
examples/l2fwd-cat/Makefile | 2 +-
examples/l2fwd-crypto/Makefile | 2 +-
examples/l2fwd-jobstats/Makefile | 2 +-
examples/l2fwd-keepalive/Makefile | 2 +-
examples/l2fwd-keepalive/ka-agent/Makefile | 2 +-
examples/l2fwd/Makefile | 2 +-
examples/l3fwd-acl/Makefile | 2 +-
examples/l3fwd-power/Makefile | 6 +-
examples/l3fwd-vf/Makefile | 2 +-
examples/l3fwd/Makefile | 2 +-
examples/link_status_interrupt/Makefile | 2 +-
examples/load_balancer/Makefile | 2 +-
examples/multi_process/Makefile | 10 +-
.../multi_process/client_server_mp/Makefile | 6 +-
.../client_server_mp/mp_server/Makefile | 6 +-
examples/multi_process/hotplug_mp/Makefile | 2 +-
examples/multi_process/simple_mp/Makefile | 2 +-
examples/multi_process/symmetric_mp/Makefile | 2 +-
examples/netmap_compat/Makefile | 2 +-
examples/netmap_compat/bridge/Makefile | 6 +-
examples/packet_ordering/Makefile | 2 +-
examples/performance-thread/Makefile | 2 +-
.../performance-thread/l3fwd-thread/Makefile | 2 +-
.../performance-thread/pthread_shim/Makefile | 2 +-
.../pthread_shim/pthread_shim.c | 2 +-
examples/ptpclient/Makefile | 2 +-
examples/qos_meter/Makefile | 2 +-
examples/qos_sched/Makefile | 6 +-
examples/quota_watermark/Makefile | 6 +-
examples/quota_watermark/qw/Makefile | 2 +-
examples/quota_watermark/qwctl/Makefile | 2 +-
examples/rxtx_callbacks/Makefile | 2 +-
examples/server_node_efd/Makefile | 6 +-
examples/server_node_efd/server/Makefile | 6 +-
examples/service_cores/Makefile | 2 +-
examples/skeleton/Makefile | 2 +-
examples/tep_termination/Makefile | 6 +-
examples/timer/Makefile | 2 +-
examples/vdpa/Makefile | 4 +-
examples/vhost/Makefile | 6 +-
examples/vhost_crypto/Makefile | 6 +-
examples/vhost_scsi/Makefile | 6 +-
examples/vm_power_manager/Makefile | 2 +-
examples/vm_power_manager/guest_cli/Makefile | 2 +-
examples/vmdq/Makefile | 2 +-
examples/vmdq_dcb/Makefile | 2 +-
kernel/Makefile | 4 +-
kernel/freebsd/Makefile | 4 +-
kernel/linux/kni/meson.build | 2 +-
lib/Makefile | 2 +-
lib/librte_eal/Makefile | 8 +-
lib/librte_eal/bsdapp/eal/Makefile | 94 ----------------
lib/librte_eal/common/arch/x86/rte_cycles.c | 2 +-
lib/librte_eal/common/eal_common_errno.c | 2 +-
.../common/include/generic/rte_byteorder.h | 2 +-
lib/librte_eal/common/include/rte_debug.h | 2 +-
lib/librte_eal/common/include/rte_eal.h | 2 +-
.../common/include/rte_string_fns.h | 4 +-
.../{bsdapp => freebsd}/BSDmakefile.meson | 0
lib/librte_eal/{bsdapp => freebsd}/Makefile | 2 +-
lib/librte_eal/freebsd/eal/Makefile | 94 ++++++++++++++++
lib/librte_eal/{bsdapp => freebsd}/eal/eal.c | 0
.../{bsdapp => freebsd}/eal/eal_alarm.c | 0
.../eal/eal_alarm_private.h | 0
.../{bsdapp => freebsd}/eal/eal_cpuflags.c | 0
.../{bsdapp => freebsd}/eal/eal_debug.c | 0
.../{bsdapp => freebsd}/eal/eal_dev.c | 0
.../eal/eal_hugepage_info.c | 0
.../{bsdapp => freebsd}/eal/eal_interrupts.c | 0
.../{bsdapp => freebsd}/eal/eal_lcore.c | 0
.../{bsdapp => freebsd}/eal/eal_memalloc.c | 0
.../{bsdapp => freebsd}/eal/eal_memory.c | 0
.../{bsdapp => freebsd}/eal/eal_thread.c | 0
.../{bsdapp => freebsd}/eal/eal_timer.c | 0
.../{bsdapp => freebsd}/eal/meson.build | 0
lib/librte_eal/{linuxapp => linux}/Makefile | 2 +-
lib/librte_eal/linux/eal/Makefile | 101 ++++++++++++++++++
lib/librte_eal/{linuxapp => linux}/eal/eal.c | 0
.../{linuxapp => linux}/eal/eal_alarm.c | 0
.../{linuxapp => linux}/eal/eal_cpuflags.c | 0
.../{linuxapp => linux}/eal/eal_debug.c | 0
.../{linuxapp => linux}/eal/eal_dev.c | 0
.../eal/eal_hugepage_info.c | 0
.../{linuxapp => linux}/eal/eal_interrupts.c | 0
.../{linuxapp => linux}/eal/eal_lcore.c | 0
.../{linuxapp => linux}/eal/eal_log.c | 0
.../{linuxapp => linux}/eal/eal_memalloc.c | 0
.../{linuxapp => linux}/eal/eal_memory.c | 0
.../{linuxapp => linux}/eal/eal_thread.c | 0
.../{linuxapp => linux}/eal/eal_timer.c | 0
.../{linuxapp => linux}/eal/eal_vfio.c | 0
.../{linuxapp => linux}/eal/eal_vfio.h | 0
.../eal/eal_vfio_mp_sync.c | 0
.../eal/include/exec-env/rte_kni_common.h | 0
.../{linuxapp => linux}/eal/meson.build | 0
lib/librte_eal/linuxapp/eal/Makefile | 101 ------------------
lib/librte_eal/meson.build | 8 +-
lib/librte_eventdev/Makefile | 2 +-
lib/librte_kni/rte_kni.c | 2 +-
mk/exec-env/bsdapp | 1 +
mk/exec-env/{bsdapp => freebsd}/rte.app.mk | 0
mk/exec-env/{bsdapp => freebsd}/rte.vars.mk | 2 +-
mk/exec-env/{linuxapp => linux}/rte.app.mk | 0
mk/exec-env/{linuxapp => linux}/rte.vars.mk | 2 +-
mk/exec-env/linuxapp | 1 +
mk/rte.app.mk | 4 +-
mk/rte.sdkconfig.mk | 9 +-
mk/rte.sdkinstall.mk | 3 +
mk/rte.sdkroot.mk | 2 +-
usertools/dpdk-setup.sh | 4 +-
311 files changed, 668 insertions(+), 635 deletions(-)
rename config/arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} (100%)
rename config/arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} (100%)
rename config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} (100%)
rename config/arm/{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} (100%)
rename config/{common_armv8a_linuxapp => common_armv8a_linux} (97%)
rename config/{common_bsdapp => common_freebsd} (91%)
rename config/{common_linuxapp => common_linux} (98%)
create mode 120000 config/defconfig_arm-armv7a-linux-gcc
create mode 120000 config/defconfig_arm64-armv8a-linux-clang
create mode 120000 config/defconfig_arm64-armv8a-linux-gcc
create mode 120000 config/defconfig_arm64-bluefield-linux-gcc
create mode 120000 config/defconfig_arm64-dpaa-linux-gcc
create mode 120000 config/defconfig_arm64-dpaa2-linux-gcc
create mode 120000 config/defconfig_arm64-stingray-linux-gcc
create mode 120000 config/defconfig_arm64-thunderx-linux-gcc
create mode 120000 config/defconfig_arm64-xgene1-linux-gcc
create mode 120000 config/defconfig_i686-native-linux-gcc
create mode 120000 config/defconfig_i686-native-linux-icc
create mode 120000 config/defconfig_ppc_64-power8-linux-gcc
create mode 120000 config/defconfig_x86_64-native-freebsd-clang
create mode 120000 config/defconfig_x86_64-native-freebsd-gcc
create mode 120000 config/defconfig_x86_64-native-linux-clang
create mode 120000 config/defconfig_x86_64-native-linux-gcc
create mode 120000 config/defconfig_x86_64-native-linux-icc
create mode 120000 config/defconfig_x86_x32-native-linux-gcc
delete mode 100644 lib/librte_eal/bsdapp/eal/Makefile
rename lib/librte_eal/{bsdapp => freebsd}/BSDmakefile.meson (100%)
rename lib/librte_eal/{bsdapp => freebsd}/Makefile (78%)
create mode 100644 lib/librte_eal/freebsd/eal/Makefile
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm_private.h (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_cpuflags.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_debug.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_dev.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_hugepage_info.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_interrupts.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_lcore.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_memalloc.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_memory.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_thread.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_timer.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/meson.build (100%)
rename lib/librte_eal/{linuxapp => linux}/Makefile (82%)
create mode 100644 lib/librte_eal/linux/eal/Makefile
rename lib/librte_eal/{linuxapp => linux}/eal/eal.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_alarm.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_cpuflags.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_debug.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_dev.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_hugepage_info.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_interrupts.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_lcore.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_log.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_memalloc.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_memory.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_thread.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_timer.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_vfio.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_vfio.h (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_vfio_mp_sync.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/include/exec-env/rte_kni_common.h (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/meson.build (100%)
delete mode 100644 lib/librte_eal/linuxapp/eal/Makefile
create mode 120000 mk/exec-env/bsdapp
rename mk/exec-env/{bsdapp => freebsd}/rte.app.mk (100%)
rename mk/exec-env/{bsdapp => freebsd}/rte.vars.mk (94%)
rename mk/exec-env/{linuxapp => linux}/rte.app.mk (100%)
rename mk/exec-env/{linuxapp => linux}/rte.vars.mk (95%)
create mode 120000 mk/exec-env/linuxappSignature · 1 line
2.20.1
PATCH 1/6 eal/bsdapp: rename to freebsd
The term "bsdapp" is a legacy one, but just calling the subdirectory "freebsd" is just clearer for all concerned.
---
MAINTAINERS | 8 ++++----
devtools/build-tags.sh | 2 +-
doc/guides/prog_guide/env_abstraction_layer.rst | 2 +-
lib/librte_eal/Makefile | 4 ++--
lib/librte_eal/{bsdapp => freebsd}/BSDmakefile.meson | 0
lib/librte_eal/{bsdapp => freebsd}/Makefile | 0
lib/librte_eal/{bsdapp => freebsd}/eal/Makefile | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm.c | 0
.../{bsdapp => freebsd}/eal/eal_alarm_private.h | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_cpuflags.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_debug.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_dev.c | 0
.../{bsdapp => freebsd}/eal/eal_hugepage_info.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_interrupts.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_lcore.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_memalloc.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_memory.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_thread.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/eal_timer.c | 0
lib/librte_eal/{bsdapp => freebsd}/eal/meson.build | 0
lib/librte_eal/meson.build | 2 +-
22 files changed, 9 insertions(+), 9 deletions(-)
rename lib/librte_eal/{bsdapp => freebsd}/BSDmakefile.meson (100%)
rename lib/librte_eal/{bsdapp => freebsd}/Makefile (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/Makefile (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_alarm_private.h (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_cpuflags.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_debug.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_dev.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_hugepage_info.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_interrupts.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_lcore.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_memalloc.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_memory.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_thread.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/eal_timer.c (100%)
rename lib/librte_eal/{bsdapp => freebsd}/eal/meson.build (100%)MAINTAINERS +4 -4
@@ -113,7 +113,7 @@ F: doc/guides/prog_guide/ext_app_lib_make_help.rst Meson build M: Bruce Richardson <[email protected]> F: meson.build -F: lib/librte_eal/bsdapp/BSDmakefile.meson +F: lib/librte_eal/freebsd/BSDmakefile.meson F: meson_options.txt F: config/rte_config.h F: buildtools/gen-pmdinfo-cfile.sh
@@ -174,7 +174,7 @@ F: lib/librte_eal/common/eal_common_fbarray.c F: lib/librte_eal/common/eal_common_mem* F: lib/librte_eal/common/eal_hugepages.h F: lib/librte_eal/linuxapp/eal/eal_mem* -F: lib/librte_eal/bsdapp/eal/eal_mem* +F: lib/librte_eal/freebsd/eal/eal_mem* F: doc/guides/prog_guide/env_abstraction_layer.rst F: app/test/test_external_mem.c F: app/test/test_func_reentrancy.c
@@ -260,8 +260,8 @@ F: drivers/bus/pci/linux/*vfio* FreeBSD EAL (with overlaps) M: Bruce Richardson <[email protected]> -F: lib/librte_eal/bsdapp/Makefile -F: lib/librte_eal/bsdapp/eal/ +F: lib/librte_eal/freebsd/Makefile +F: lib/librte_eal/freebsd/eal/ F: doc/guides/freebsd_gsg/ FreeBSD contigmem
devtools/build-tags.sh +1 -1
@@ -72,7 +72,7 @@ linux_sources() bsd_sources() { - find_sources "lib/librte_eal/bsdapp" '*.[chS]' + find_sources "lib/librte_eal/freebsd" '*.[chS]' } arm_common()
doc/guides/prog_guide/env_abstraction_layer.rst +1 -1
@@ -349,7 +349,7 @@ EAL provides the event APIs for this event-driven thread mode. Taking linuxapp as an example, the implementation relies on epoll. Each thread can monitor an epoll instance in which all the wake-up events' file descriptors are added. The event file descriptors are created and mapped to the interrupt vectors according to the UIO/VFIO spec. -From bsdapp's perspective, kqueue is the alternative way, but not implemented yet. +From FreeBSD's perspective, kqueue is the alternative way, but not implemented yet. EAL initializes the mapping between event file descriptors and interrupt vectors, while each device initializes the mapping between interrupt vectors and queues. In this way, EAL actually is unaware of the interrupt cause on the specific vector.
lib/librte_eal/Makefile +2 -2
@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp DEPDIRS-linuxapp := common -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += bsdapp -DEPDIRS-bsdapp := common +DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd +DEPDIRS-freebsd := common include $(RTE_SDK)/mk/rte.subdir.mk
lib/librte_eal/freebsd/BSDmakefile.meson renamed from lib/librte_eal/bsdapp/BSDmakefile.meson +0 -0
lib/librte_eal/freebsd/Makefile renamed from lib/librte_eal/bsdapp/Makefile +0 -0
lib/librte_eal/freebsd/eal/Makefile renamed from lib/librte_eal/bsdapp/eal/Makefile +0 -0
lib/librte_eal/freebsd/eal/eal.c renamed from lib/librte_eal/bsdapp/eal/eal.c +0 -0
lib/librte_eal/freebsd/eal/eal_alarm.c renamed from lib/librte_eal/bsdapp/eal/eal_alarm.c +0 -0
lib/librte_eal/freebsd/eal/eal_alarm_private.h renamed from lib/librte_eal/bsdapp/eal/eal_alarm_private.h +0 -0
lib/librte_eal/freebsd/eal/eal_cpuflags.c renamed from lib/librte_eal/bsdapp/eal/eal_cpuflags.c +0 -0
lib/librte_eal/freebsd/eal/eal_debug.c renamed from lib/librte_eal/bsdapp/eal/eal_debug.c +0 -0
lib/librte_eal/freebsd/eal/eal_dev.c renamed from lib/librte_eal/bsdapp/eal/eal_dev.c +0 -0
lib/librte_eal/freebsd/eal/eal_hugepage_info.c renamed from lib/librte_eal/bsdapp/eal/eal_hugepage_info.c +0 -0
lib/librte_eal/freebsd/eal/eal_interrupts.c renamed from lib/librte_eal/bsdapp/eal/eal_interrupts.c +0 -0
lib/librte_eal/freebsd/eal/eal_lcore.c renamed from lib/librte_eal/bsdapp/eal/eal_lcore.c +0 -0
lib/librte_eal/freebsd/eal/eal_memalloc.c renamed from lib/librte_eal/bsdapp/eal/eal_memalloc.c +0 -0
lib/librte_eal/freebsd/eal/eal_memory.c renamed from lib/librte_eal/bsdapp/eal/eal_memory.c +0 -0
lib/librte_eal/freebsd/eal/eal_thread.c renamed from lib/librte_eal/bsdapp/eal/eal_thread.c +0 -0
lib/librte_eal/freebsd/eal/eal_timer.c renamed from lib/librte_eal/bsdapp/eal/eal_timer.c +0 -0
lib/librte_eal/freebsd/eal/meson.build renamed from lib/librte_eal/bsdapp/eal/meson.build +0 -0
lib/librte_eal/meson.build +1 -1
@@ -15,7 +15,7 @@ if host_machine.system() == 'linux' elif host_machine.system() == 'freebsd' dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1) - subdir('bsdapp/eal') + subdir('freebsd/eal') else error('unsupported system type "@0@"'.format(host_machine.system()))
Signature · 1 line
2.20.1
PATCH 2/6 eal/linuxapp: rename to linux
In reply to Bruce RichardsonThe term "linuxapp" is a legacy one, but just calling the subdirectory "linux" is just clearer for all concerned.
---
MAINTAINERS | 8 ++++----
devtools/build-tags.sh | 2 +-
doc/guides/prog_guide/env_abstraction_layer.rst | 2 +-
drivers/bus/dpaa/Makefile | 2 +-
drivers/crypto/caam_jr/Makefile | 2 +-
drivers/crypto/dpaa2_sec/Makefile | 2 +-
drivers/crypto/dpaa_sec/Makefile | 2 +-
drivers/event/dpaa/Makefile | 2 +-
drivers/event/dpaa2/Makefile | 2 +-
drivers/mempool/dpaa2/Makefile | 2 +-
drivers/net/dpaa/Makefile | 2 +-
drivers/net/dpaa2/Makefile | 2 +-
drivers/raw/dpaa2_qdma/Makefile | 2 +-
kernel/linux/kni/meson.build | 2 +-
lib/librte_eal/Makefile | 4 ++--
lib/librte_eal/{linuxapp => linux}/Makefile | 0
lib/librte_eal/{linuxapp => linux}/eal/Makefile | 0
lib/librte_eal/{linuxapp => linux}/eal/eal.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_alarm.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_cpuflags.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_debug.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_dev.c | 0
.../{linuxapp => linux}/eal/eal_hugepage_info.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_interrupts.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_lcore.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_log.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_memalloc.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_memory.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_thread.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_timer.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_vfio.c | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_vfio.h | 0
lib/librte_eal/{linuxapp => linux}/eal/eal_vfio_mp_sync.c | 0
.../eal/include/exec-env/rte_kni_common.h | 0
lib/librte_eal/{linuxapp => linux}/eal/meson.build | 0
lib/librte_eal/meson.build | 2 +-
36 files changed, 20 insertions(+), 20 deletions(-)
rename lib/librte_eal/{linuxapp => linux}/Makefile (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/Makefile (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_alarm.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_cpuflags.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_debug.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_dev.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_hugepage_info.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_interrupts.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_lcore.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_log.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_memalloc.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_memory.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_thread.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_timer.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_vfio.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_vfio.h (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/eal_vfio_mp_sync.c (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/include/exec-env/rte_kni_common.h (100%)
rename lib/librte_eal/{linuxapp => linux}/eal/meson.build (100%)MAINTAINERS +4 -4
@@ -173,7 +173,7 @@ F: lib/librte_eal/common/*malloc* F: lib/librte_eal/common/eal_common_fbarray.c F: lib/librte_eal/common/eal_common_mem* F: lib/librte_eal/common/eal_hugepages.h -F: lib/librte_eal/linuxapp/eal/eal_mem* +F: lib/librte_eal/linux/eal/eal_mem* F: lib/librte_eal/freebsd/eal/eal_mem* F: doc/guides/prog_guide/env_abstraction_layer.rst F: app/test/test_external_mem.c
@@ -244,8 +244,8 @@ F: lib/librte_eal/common/arch/x86/ F: lib/librte_eal/common/include/arch/x86/ Linux EAL (with overlaps) -F: lib/librte_eal/linuxapp/Makefile -F: lib/librte_eal/linuxapp/eal/ +F: lib/librte_eal/linux/Makefile +F: lib/librte_eal/linux/eal/ F: doc/guides/linux_gsg/ Linux UIO
@@ -255,7 +255,7 @@ F: drivers/bus/pci/linux/*uio* Linux VFIO M: Anatoly Burakov <[email protected]> -F: lib/librte_eal/linuxapp/eal/*vfio* +F: lib/librte_eal/linux/eal/*vfio* F: drivers/bus/pci/linux/*vfio* FreeBSD EAL (with overlaps)
devtools/build-tags.sh +1 -1
@@ -67,7 +67,7 @@ common_sources() linux_sources() { - find_sources "lib/librte_eal/linuxapp" '*.[chS]' + find_sources "lib/librte_eal/linux" '*.[chS]' } bsd_sources()
doc/guides/prog_guide/env_abstraction_layer.rst +1 -1
@@ -346,7 +346,7 @@ To ease the idle polling with tiny throughput, it's useful to pause the polling The RX interrupt is the first choice to be such kind of wake-up event, but probably won't be the only one. EAL provides the event APIs for this event-driven thread mode. -Taking linuxapp as an example, the implementation relies on epoll. Each thread can monitor an epoll instance +Taking Linux as an example, the implementation relies on epoll. Each thread can monitor an epoll instance in which all the wake-up events' file descriptors are added. The event file descriptors are created and mapped to the interrupt vectors according to the UIO/VFIO spec. From FreeBSD's perspective, kqueue is the alternative way, but not implemented yet.
drivers/bus/dpaa/Makefile +1 -1
@@ -17,7 +17,7 @@ CFLAGS += -Wno-cast-qual CFLAGS += -I$(RTE_BUS_DPAA)/ CFLAGS += -I$(RTE_BUS_DPAA)/include CFLAGS += -I$(RTE_BUS_DPAA)/base/qbman -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include # versioning export map
drivers/crypto/caam_jr/Makefile +1 -1
@@ -21,7 +21,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr #sharing the hw flib headers from dpaa2_sec pmd CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal # versioning export map EXPORT_MAP := rte_pmd_caam_jr_version.map
drivers/crypto/dpaa2_sec/Makefile +1 -1
@@ -27,7 +27,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2/ -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal # versioning export map EXPORT_MAP := rte_pmd_dpaa2_sec_version.map
drivers/crypto/dpaa_sec/Makefile +1 -1
@@ -20,7 +20,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa_sec/ #sharing the hw flib headers from dpaa2_sec pmd CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_cryptodev
drivers/event/dpaa/Makefile +1 -1
@@ -20,7 +20,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include/ CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal/include +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal/include EXPORT_MAP := rte_pmd_dpaa_event_version.map
drivers/event/dpaa2/Makefile +1 -1
@@ -17,7 +17,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa2 -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal LDLIBS += -lrte_eal -lrte_eventdev LDLIBS += -lrte_bus_fslmc -lrte_mempool_dpaa2 -lrte_pmd_dpaa2 LDLIBS += -lrte_bus_vdev
drivers/mempool/dpaa2/Makefile +1 -1
@@ -13,7 +13,7 @@ CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal # versioning export map EXPORT_MAP := rte_mempool_dpaa2_version.map
drivers/net/dpaa/Makefile +1 -1
@@ -21,7 +21,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa CFLAGS += -I$(RTE_SDK)/drivers/event/dpaa CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal/include +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal/include EXPORT_MAP := rte_pmd_dpaa_version.map
drivers/net/dpaa2/Makefile +1 -1
@@ -19,7 +19,7 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/mc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/portal CFLAGS += -I$(RTE_SDK)/drivers/mempool/dpaa2 -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal # versioning export map EXPORT_MAP := rte_pmd_dpaa2_version.map
drivers/raw/dpaa2_qdma/Makefile +1 -1
@@ -12,7 +12,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linuxapp/eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc CFLAGS += -I$(RTE_SDK)/drivers/bus/fslmc/qbman/include
kernel/linux/kni/meson.build +1 -1
@@ -21,7 +21,7 @@ custom_target('rte_kni', 'src=' + meson.current_source_dir(), 'MODULE_CFLAGS=-include ' + meson.source_root() + '/config/rte_config.h' + ' -I' + meson.source_root() + '/lib/librte_eal/common/include' + - ' -I' + meson.source_root() + '/lib/librte_eal/linuxapp/eal/include' + + ' -I' + meson.source_root() + '/lib/librte_eal/linux/eal/include' + ' -I' + meson.build_root() + ' -I' + meson.current_source_dir() + ' -I' + meson.current_source_dir() + '/ethtool/ixgbe' +
lib/librte_eal/Makefile +2 -2
@@ -4,8 +4,8 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linuxapp -DEPDIRS-linuxapp := common +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linux +DEPDIRS-linux := common DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd DEPDIRS-freebsd := common
lib/librte_eal/linux/Makefile renamed from lib/librte_eal/linuxapp/Makefile +0 -0
lib/librte_eal/linux/eal/Makefile renamed from lib/librte_eal/linuxapp/eal/Makefile +0 -0
lib/librte_eal/linux/eal/eal.c renamed from lib/librte_eal/linuxapp/eal/eal.c +0 -0
lib/librte_eal/linux/eal/eal_alarm.c renamed from lib/librte_eal/linuxapp/eal/eal_alarm.c +0 -0
lib/librte_eal/linux/eal/eal_cpuflags.c renamed from lib/librte_eal/linuxapp/eal/eal_cpuflags.c +0 -0
lib/librte_eal/linux/eal/eal_debug.c renamed from lib/librte_eal/linuxapp/eal/eal_debug.c +0 -0
lib/librte_eal/linux/eal/eal_dev.c renamed from lib/librte_eal/linuxapp/eal/eal_dev.c +0 -0
lib/librte_eal/linux/eal/eal_hugepage_info.c renamed from lib/librte_eal/linuxapp/eal/eal_hugepage_info.c +0 -0
lib/librte_eal/linux/eal/eal_interrupts.c renamed from lib/librte_eal/linuxapp/eal/eal_interrupts.c +0 -0
lib/librte_eal/linux/eal/eal_lcore.c renamed from lib/librte_eal/linuxapp/eal/eal_lcore.c +0 -0
lib/librte_eal/linux/eal/eal_log.c renamed from lib/librte_eal/linuxapp/eal/eal_log.c +0 -0
lib/librte_eal/linux/eal/eal_memalloc.c renamed from lib/librte_eal/linuxapp/eal/eal_memalloc.c +0 -0
lib/librte_eal/linux/eal/eal_memory.c renamed from lib/librte_eal/linuxapp/eal/eal_memory.c +0 -0
lib/librte_eal/linux/eal/eal_thread.c renamed from lib/librte_eal/linuxapp/eal/eal_thread.c +0 -0
lib/librte_eal/linux/eal/eal_timer.c renamed from lib/librte_eal/linuxapp/eal/eal_timer.c +0 -0
lib/librte_eal/linux/eal/eal_vfio.c renamed from lib/librte_eal/linuxapp/eal/eal_vfio.c +0 -0
lib/librte_eal/linux/eal/eal_vfio.h renamed from lib/librte_eal/linuxapp/eal/eal_vfio.h +0 -0
lib/librte_eal/linux/eal/eal_vfio_mp_sync.c renamed from lib/librte_eal/linuxapp/eal/eal_vfio_mp_sync.c +0 -0
lib/librte_eal/linux/eal/include/exec-env/rte_kni_common.h renamed from lib/librte_eal/linuxapp/eal/include/exec-env/rte_kni_common.h +0 -0
lib/librte_eal/linux/eal/meson.build renamed from lib/librte_eal/linuxapp/eal/meson.build +0 -0
lib/librte_eal/meson.build +1 -1
@@ -11,7 +11,7 @@ subdir('common') # defines common_sources, common_objs, etc. # The <exec-env>/eal/meson.build file should define env_sources, etc. if host_machine.system() == 'linux' dpdk_conf.set('RTE_EXEC_ENV_LINUXAPP', 1) - subdir('linuxapp/eal') + subdir('linux/eal') elif host_machine.system() == 'freebsd' dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1)
Signature · 1 line
2.20.1
PATCH 3/6 build/linux: rename macro from LINUXAPP to LINUX
In reply to Bruce RichardsonRename the macro to make things shorter and more comprehensible. For both meson and make builds, keep the old macro around for backward compatibility.
--- app/test/process.h | 2 +- app/test/test_eal_flags.c | 2 +- app/test/test_interrupts.c | 4 +- app/test/test_kni.c | 2 +- app/test/test_mp_secondary.c | 6 +- app/test/test_pdump.c | 2 +- app/test/test_timer_perf.c | 2 +- app/test/test_timer_racecond.c | 2 +- config/common_linuxapp | 1 + config/rte_config.h | 5 + doc/guides/contributing/design.rst | 2 +- drivers/bus/pci/Makefile | 2 +- drivers/bus/vmbus/Makefile | 2 +- drivers/crypto/virtio/virtio_pci.c | 2 +- drivers/net/ark/Makefile | 2 +- drivers/net/failsafe/Makefile | 2 +- drivers/net/pcap/rte_eth_pcap.c | 2 +- drivers/net/sfc/sfc_intr.c | 2 +- drivers/net/softnic/rte_eth_softnic_tap.c | 4 +- drivers/net/virtio/virtio_pci.c | 2 +- examples/ethtool/Makefile | 2 +- examples/ethtool/lib/Makefile | 2 +- examples/exception_path/main.c | 4 +- examples/ip_pipeline/Makefile | 2 +- examples/ip_pipeline/tap.c | 4 +- examples/kni/Makefile | 2 +- examples/l3fwd-power/Makefile | 2 +- examples/multi_process/Makefile | 8 +- .../multi_process/client_server_mp/Makefile | 4 +- .../client_server_mp/mp_server/Makefile | 2 +- examples/netmap_compat/bridge/Makefile | 2 +- .../pthread_shim/pthread_shim.c | 2 +- examples/qos_sched/Makefile | 2 +- examples/quota_watermark/Makefile | 4 +- examples/server_node_efd/Makefile | 4 +- examples/server_node_efd/server/Makefile | 2 +- examples/tep_termination/Makefile | 2 +- examples/vhost/Makefile | 2 +- examples/vhost_crypto/Makefile | 2 +- examples/vhost_scsi/Makefile | 2 +- kernel/Makefile | 2 +- lib/Makefile | 2 +- lib/librte_eal/Makefile | 2 +- lib/librte_eal/common/arch/x86/rte_cycles.c | 2 +- lib/librte_eal/linux/Makefile | 2 +- lib/librte_eal/linux/eal/Makefile | 98 +++++++++---------- lib/librte_eal/meson.build | 2 +- lib/librte_eventdev/Makefile | 2 +- lib/librte_kni/rte_kni.c | 2 +- mk/rte.app.mk | 4 +- 50 files changed, 115 insertions(+), 109 deletions(-)
app/test/process.h +1 -1
@@ -82,7 +82,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value)/* FreeBSD doesn't support file prefixes, so force compile failures for any * tests attempting to use this function on FreeBSD. */ -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX static char *get_current_prefix (char *prefix,int size) {
app/test/test_eal_flags.c +1 -1
@@ -190,7 +190,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)return result; } -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX /* * count the number of "node*" files in /sys/devices/system/node/ */
app/test/test_interrupts.c +2 -2
@@ -31,7 +31,7 @@ static struct rte_intr_handle intr_handles[TEST_INTERRUPT_HANDLE_MAX];static enum test_interrupt_handle_type test_intr_type =TEST_INTERRUPT_HANDLE_MAX ; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX union intr_pipefds{ struct { int pipefd[2];
@@ -169,7 +169,7 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l, return 0; } -#endif /* RTE_EXEC_ENV_LINUXAPP */ +#endif /* RTE_EXEC_ENV_LINUX */ /** * Callback for the test interrupt.
app/test/test_kni.c +1 -1
@@ -11,7 +11,7 @@#include "test.h" -#if !defined(RTE_EXEC_ENV_LINUXAPP ) || !defined(RTE_LIBRTE_KNI ) +#if !defined(RTE_EXEC_ENV_LINUX ) || !defined(RTE_LIBRTE_KNI )static int test_kni (void )
app/test/test_mp_secondary.c +3 -3
@@ -60,7 +60,7 @@ run_secondary_instances(void)int ret =0 ;char coremask[10 ]; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX char tmp[PATH_MAX ] = {0 };char prefix[PATH_MAX ] = {0 };
@@ -86,7 +86,7 @@ run_secondary_instances(void) prgname,"-c" , coremask,"--proc-type=ERROR" , prefix }; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX /* bad case, using invalid file prefix */ const char *argv4[] = { prgname, "-c", coremask, "--proc-type=secondary",
@@ -101,7 +101,7 @@ run_secondary_instances(void) ret |=launch_proc (argv2); ret |= !(launch_proc (argv3)); -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX ret |= !(launch_proc (argv4));#endif
app/test/test_pdump.c +1 -1
@@ -172,7 +172,7 @@ run_pdump_server_tests(void)int ret =0 ;char coremask[10 ]; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX char tmp[PATH_MAX ] = {0 };char prefix[PATH_MAX ] = {0 };
app/test/test_timer_perf.c +1 -1
@@ -27,7 +27,7 @@ timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused)#define DELAY_SECONDS 1 -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #define do_delay () usleep(10)#else #define do_delay () rte_pause()
app/test/test_timer_racecond.c +1 -1
@@ -46,7 +46,7 @@#undef TEST_TIMER_RACECOND_VERBOSE -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #define usec_delay (us) usleep(us)#else #define usec_delay (us) rte_delay_us(us)
config/common_linuxapp +1 -0
@@ -4,6 +4,7 @@ #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_config.h +5 -0
@@ -18,6 +18,11 @@#include <rte_build_config.h> +/* legacy defines */ +#ifdef RTE_EXEC_ENV_LINUX +#define RTE_EXEC_ENV_LINUXAPP 1 +#endif +/****** library defines ********/ /* compat defines */
doc/guides/contributing/design.rst +1 -1
@@ -55,7 +55,7 @@ Per Execution Environment Sources The following config options can be used: * ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_BSDAPP`` or ``CONFIG_RTE_EXEC_ENV_LINUXAPP`` are defined only if we are building for this execution environment. +* ``CONFIG_RTE_EXEC_ENV_BSDAPP`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Library Statistics ------------------
drivers/bus/pci/Makefile +1 -1
@@ -11,7 +11,7 @@ CFLAGS := -I$(SRCDIR) $(CFLAGS) CFLAGS += -O3 $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) SYSTEM := linux endif ifneq ($(CONFIG_RTE_EXEC_ENV_BSDAPP),)
drivers/bus/vmbus/Makefile +1 -1
@@ -10,7 +10,7 @@ CFLAGS += -I$(SRCDIR) CFLAGS += -O3 $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) SYSTEM := linux endif ifneq ($(CONFIG_RTE_EXEC_ENV_BSDAPP),)
drivers/crypto/virtio/virtio_pci.c +1 -1
@@ -4,7 +4,7 @@#include <stdint.h> -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include <dirent.h> #include <fcntl.h> #endif
drivers/net/ark/Makefile +1 -1
@@ -31,7 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c # this lib depends upon: LDLIBS += -lpthread -ifdef CONFIG_RTE_EXEC_ENV_LINUXAPP +ifdef CONFIG_RTE_EXEC_ENV_LINUX LDLIBS += -ldl endif LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring
drivers/net/failsafe/Makefile +1 -1
@@ -20,7 +20,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) CFLAGS += -DLINUX else CFLAGS += -DBSD
drivers/net/pcap/rte_eth_pcap.c +1 -1
@@ -979,7 +979,7 @@ static int eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev, const unsigned int numa_node) { -#if defined(RTE_EXEC_ENV_LINUXAPP) +#if defined(RTE_EXEC_ENV_LINUX) void *mac_addrs;struct ifreq ifr;int if_fd =socket (AF_INET ,SOCK_DGRAM ,0 );
drivers/net/sfc/sfc_intr.c +1 -1
@@ -292,7 +292,7 @@ sfc_intr_attach(struct sfc_adapter *sa)sfc_log_init (sa,"entry" );switch (pci_dev->intr_handle.type) { -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX case RTE_INTR_HANDLE_UIO_INTX :case RTE_INTR_HANDLE_VFIO_LEGACY : intr->type =EFX_INTR_LINE ;
drivers/net/softnic/rte_eth_softnic_tap.c +2 -2
@@ -3,7 +3,7 @@*/ #include <netinet/in.h> -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include <linux/if.h> #include <linux/if_tun.h> #endif
@@ -60,7 +60,7 @@ softnic_tap_find(struct pmd_internals *p,return NULL ; } -#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_LINUX struct softnic_tap * softnic_tap_create(struct pmd_internals *p __rte_unused,
drivers/net/virtio/virtio_pci.c +1 -1
@@ -3,7 +3,7 @@*/ #include <stdint.h> -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include <dirent.h> #include <fcntl.h> #endif
examples/ethtool/Makefile +1 -1
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) else
examples/ethtool/lib/Makefile +1 -1
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif
examples/exception_path/main.c +2 -2
@@ -14,7 +14,7 @@#include <netinet/in.h> #include <net/if.h> -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include <linux/if_tun.h> #endif #include <fcntl.h>
@@ -156,7 +156,7 @@ signal_handler(int signum) } } -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX /* * Create a tap network interface, or use existing one with same name. * If name[0]='\0' then a name is automatically assigned and returned in name.
examples/ip_pipeline/Makefile +1 -1
@@ -68,7 +68,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
examples/ip_pipeline/tap.c +2 -2
@@ -3,7 +3,7 @@*/ #include <netinet/in.h> -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include <linux/if.h> #include <linux/if_tun.h> #endif
@@ -46,7 +46,7 @@ tap_find(const char *name)return NULL ; } -#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_LINUX struct tap * tap_create(const char *name __rte_unused)
examples/kni/Makefile +1 -1
@@ -49,7 +49,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif
examples/l3fwd-power/Makefile +1 -1
@@ -50,7 +50,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
examples/multi_process/Makefile +4 -4
@@ -10,9 +10,9 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += hotplug_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/multi_process/client_server_mp/Makefile +2 -2
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_server +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/multi_process/client_server_mp/mp_server/Makefile +1 -1
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif
examples/netmap_compat/bridge/Makefile +1 -1
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
examples/performance-thread/pthread_shim/pthread_shim.c +1 -1
@@ -558,7 +558,7 @@ int pthread_rwlock_wrlock(pthread_rwlock_t *a)return _sys_pthread_funcs.f_pthread_rwlock_wrlock (a); } -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX int pthread_yield (void ) {
examples/qos_sched/Makefile +1 -1
@@ -48,7 +48,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
examples/quota_watermark/Makefile +2 -2
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qw -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qwctl +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qw +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qwctl include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/server_node_efd/Makefile +2 -2
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += node +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node include $(RTE_SDK)/mk/rte.extsubdir.mk
examples/server_node_efd/server/Makefile +1 -1
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif
examples/tep_termination/Makefile +1 -1
@@ -52,7 +52,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif
examples/vhost/Makefile +1 -1
@@ -52,7 +52,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
examples/vhost_crypto/Makefile +1 -1
@@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
examples/vhost_scsi/Makefile +1 -1
@@ -51,7 +51,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all:
kernel/Makefile +1 -1
@@ -3,7 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linux +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd include $(RTE_SDK)/mk/rte.subdir.mk
lib/Makefile +1 -1
@@ -110,7 +110,7 @@ DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security DIRS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += librte_telemetry DEPDIRS-librte_telemetry := librte_eal librte_metrics librte_ethdev -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni endif DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev
lib/librte_eal/Makefile +1 -1
@@ -4,7 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linux +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux DEPDIRS-linux := common DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd DEPDIRS-freebsd := common
lib/librte_eal/common/arch/x86/rte_cycles.c +1 -1
@@ -29,7 +29,7 @@ rte_cpu_get_model(uint32_t fam_mod_step)static int32_t rdmsr (int msr,uint64_t *val) { -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX int fd;int ret;
lib/librte_eal/linux/Makefile +1 -1
@@ -3,7 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal DEPDIRS-kni := eal CFLAGS += -DALLOW_EXPERIMENTAL_API
lib/librte_eal/linux/eal/Makefile +49 -49
114 lines not on this page · raw message
lib/librte_eal/meson.build +1 -1
@@ -10,7 +10,7 @@ subdir('common') # defines common_sources, common_objs, etc. # Now do OS/exec-env specific settings, including building kernel modules # The <exec-env>/eal/meson.build file should define env_sources, etc. if host_machine.system() == 'linux' - dpdk_conf.set('RTE_EXEC_ENV_LINUXAPP', 1) + dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) subdir('linux/eal') elif host_machine.system() == 'freebsd'
lib/librte_eventdev/Makefile +1 -1
@@ -14,7 +14,7 @@ LIBABIVER := 6 CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) CFLAGS += -DLINUX else CFLAGS += -DBSD
lib/librte_kni/rte_kni.c +1 -1
@@ -2,7 +2,7 @@* Copyright(c) 2010-2014 Intel Corporation */ -#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_LINUX #error "KNI is not supported"#endif
mk/rte.app.mk +2 -2
@@ -97,7 +97,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni endif
@@ -306,7 +306,7 @@ ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) # The static libraries do not know their dependencies. # So linking with static library requires explicit dependencies. _LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrt -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) _LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lnuma endif _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm
Signature · 1 line
2.20.1
PATCH 4/6 build/freebsd: rename macro from BSDPAPP to FREEBSD
In reply to Bruce RichardsonRename the macro and all instances in DPDK code, but keep a copy of the old macro defined for legacy code linking against DPDK
--- app/test-bbdev/test_bbdev_vector.c | 2 +- .../cperf_test_vector_parsing.c | 2 +- app/test-pmd/testpmd.c | 2 +- app/test/process.h | 2 +- app/test/test_alarm.c | 2 +- app/test/test_eal_flags.c | 32 +++---- app/test/test_eal_fs.c | 2 +- app/test/test_errno.c | 2 +- app/test/test_mempool.c | 2 +- config/common_bsdapp | 2 +- config/rte_config.h | 3 + doc/guides/contributing/design.rst | 2 +- drivers/bus/pci/Makefile | 2 +- drivers/bus/vmbus/Makefile | 2 +- drivers/net/failsafe/failsafe_private.h | 2 +- drivers/net/pcap/rte_eth_pcap.c | 4 +- kernel/Makefile | 2 +- kernel/freebsd/Makefile | 4 +- lib/librte_eal/Makefile | 2 +- lib/librte_eal/common/eal_common_errno.c | 2 +- .../common/include/generic/rte_byteorder.h | 2 +- .../common/include/rte_string_fns.h | 4 +- lib/librte_eal/freebsd/Makefile | 2 +- lib/librte_eal/freebsd/eal/Makefile | 92 +++++++++---------- lib/librte_eal/meson.build | 2 +- 25 files changed, 90 insertions(+), 87 deletions(-)
app/test-bbdev/test_bbdev_vector.c +1 -1
@@ -2,7 +2,7 @@* Copyright(c) 2017 Intel Corporation */ -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD #define _WITH_GETLINE#endif #include <stdio.h>
app/test-crypto-perf/cperf_test_vector_parsing.c +1 -1
@@ -1,7 +1,7 @@/* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2016-2017 Intel Corporation */ -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD #define _WITH_GETLINE#endif #include <stdio.h>
app/test-pmd/testpmd.c +1 -1
@@ -3125,7 +3125,7 @@ main(int argc, char** argv)#endif /* on FreeBSD, mlockall() is disabled by default */ -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD do_mlockall =0 ;#else do_mlockall =1 ;
app/test/process.h +1 -1
@@ -11,7 +11,7 @@#include <unistd.h> /* readlink */ #include <sys/wait.h> -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD #define self "curproc"#define exe "file"#else
app/test/test_alarm.c +1 -1
@@ -178,7 +178,7 @@ static inttest_alarm (void) {int count =0 ; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD printf ("The alarm API is not supported on FreeBSD\n" );return 0 ;#endif
app/test/test_eal_flags.c +16 -16
@@ -231,7 +231,7 @@ static inttest_whitelist_flag (void) {unsigned i; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;#else
@@ -297,7 +297,7 @@ test_whitelist_flag(void)static int test_invalid_b_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;#else
@@ -344,7 +344,7 @@ test_invalid_b_flag(void)static int test_invalid_vdev_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point, and we also need to * run another primary process here */ const char * prefix = no_shconf;
@@ -398,7 +398,7 @@ test_invalid_vdev_flag(void)static int test_invalid_r_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;#else
@@ -442,7 +442,7 @@ test_invalid_r_flag(void)static int test_missing_c_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;#else
@@ -592,7 +592,7 @@ test_missing_c_flag(void)static int test_master_lcore_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char *prefix ="" ;#else
@@ -640,7 +640,7 @@ test_master_lcore_flag(void)static int test_invalid_n_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;#else
@@ -690,7 +690,7 @@ test_no_hpet_flag(void) {char prefix[PATH_MAX ] ="" ; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD return 0 ;#else char tmp[PATH_MAX ];
@@ -724,7 +724,7 @@ test_no_hpet_flag(void)static int test_no_huge_flag (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point, and we also need to * run another primary process here */ const char * prefix = no_shconf;
@@ -752,7 +752,7 @@ test_no_huge_flag(void)printf ("Error - process did not run ok with --no-huge and -m flags\n" );return -1 ; } -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target does not support NUMA, hence no --socket-mem tests */ return 0 ;#endif
@@ -774,7 +774,7 @@ static inttest_misc_flags (void) {char hugepath[PATH_MAX ] = {0 }; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;const char * nosh_prefix ="" ;
@@ -898,7 +898,7 @@ test_misc_flags(void)return -1 ; } -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* no more tests to be done on FreeBSD */ return 0 ;#endif
@@ -978,7 +978,7 @@ test_file_prefix(void)*/ char prefix[PATH_MAX ] ="" ; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD return 0 ;#else if (get_current_prefix (prefix,sizeof (prefix)) ==NULL ) {
@@ -1138,7 +1138,7 @@ test_file_prefix(void)static int test_memory_flags (void ) { -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix ="" ;#else
@@ -1191,7 +1191,7 @@ test_memory_flags(void)char invalid_socket_mem[SOCKET_MEM_STRLEN ];char buf[SOCKET_MEM_STRLEN ];/* to avoid copying string onto itself */ -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD int i, num_sockets =1 ;#else int i, num_sockets = RTE_MIN(get_number_of_sockets(),
@@ -1247,7 +1247,7 @@ test_memory_flags(void)return -1 ; } -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* no other tests are applicable to BSD */ return 0 ;#endif
app/test/test_eal_fs.c +1 -1
@@ -22,7 +22,7 @@ test_parse_sysfs_value(void)unsigned valid_number;unsigned long retval =0 ; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD doesn't have /proc/pid/fd */ return 0 ;#endif
app/test/test_errno.c +1 -1
@@ -18,7 +18,7 @@ test_errno(void) {const char *rte_retval;const char *libc_retval; -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD /* BSD has a colon in the string, unlike linux */ const char unknown_code_result[] ="Unknown error: %d" ;#else
app/test/test_mempool.c +1 -1
@@ -116,7 +116,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache) MEMPOOL_HEADER_SIZE(mp, mp->cache_size))GOTO_ERR (ret, out); -#ifndef RTE_EXEC_ENV_BSDAPP /* rte_mem_virt2iova() not supported on bsd */ +#ifndef RTE_EXEC_ENV_FREEBSD /* rte_mem_virt2iova() not supported on bsd */ printf ("get physical address of an object\n" );if (rte_mempool_virt2iova (obj) !=rte_mem_virt2iova (obj))GOTO_ERR (ret, out);
config/common_bsdapp +1 -0
@@ -4,7 +4,8 @@ #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_config.h +3 -0
@@ -22,6 +22,9 @@#ifdef RTE_EXEC_ENV_LINUX #define RTE_EXEC_ENV_LINUXAPP 1#endif +#ifdef RTE_EXEC_ENV_FREEBSD +#define RTE_EXEC_ENV_BSDAPP 1 +#endif /****** library defines ********/
doc/guides/contributing/design.rst +1 -1
@@ -55,7 +55,7 @@ Per Execution Environment Sources The following config options can be used: * ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_BSDAPP`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. +* ``CONFIG_RTE_EXEC_ENV_FREEBSD`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Library Statistics ------------------
drivers/bus/pci/Makefile +1 -1
@@ -14,7 +14,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) SYSTEM := linux endif -ifneq ($(CONFIG_RTE_EXEC_ENV_BSDAPP),) +ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) SYSTEM := bsd endif
drivers/bus/vmbus/Makefile +1 -1
@@ -13,7 +13,7 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) SYSTEM := linux endif -ifneq ($(CONFIG_RTE_EXEC_ENV_BSDAPP),) +ifneq ($(CONFIG_RTE_EXEC_ENV_FREEBSD),) $(error "VMBUS not implemented for BSD yet") endif
drivers/net/failsafe/failsafe_private.h +1 -1
@@ -331,7 +331,7 @@ extern int failsafe_mac_from_arg; &((struct txq *)((s)->fs_dev->data->tx_queues[i]))->refcnt[(s)->sid] \ ) -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD #define FS_THREADID_TYPE void*#define FS_THREADID_FMT "p"#else
drivers/net/pcap/rte_eth_pcap.c +2 -2
@@ -11,7 +11,7 @@#include <sys/ioctl.h> #include <unistd.h> -#if defined(RTE_EXEC_ENV_BSDAPP ) +#if defined(RTE_EXEC_ENV_FREEBSD )#include <sys/sysctl.h> #include <net/if_dl.h> #endif
@@ -1008,7 +1008,7 @@ eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev,return 0 ; -#elif defined(RTE_EXEC_ENV_BSDAPP ) +#elif defined(RTE_EXEC_ENV_FREEBSD )void *mac_addrs;struct if_msghdr *ifm;struct sockaddr_dl *sdl;
kernel/Makefile +1 -1
@@ -4,6 +4,6 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd +DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd include $(RTE_SDK)/mk/rte.subdir.mk
kernel/freebsd/Makefile +2 -2
@@ -3,7 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += contigmem -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += nic_uio +DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += contigmem +DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += nic_uio include $(RTE_SDK)/mk/rte.subdir.mk
lib/librte_eal/Makefile +1 -1
@@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux DEPDIRS-linux := common -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd +DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += freebsd DEPDIRS-freebsd := common include $(RTE_SDK)/mk/rte.subdir.mk
lib/librte_eal/common/eal_common_errno.c +1 -1
@@ -21,7 +21,7 @@ const char * rte_strerror(int errnum) {/* BSD puts a colon in the "unknown error" messages, Linux doesn't */ -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD static const char *sep =":" ;#else static const char *sep ="" ;
lib/librte_eal/common/include/generic/rte_byteorder.h +1 -1
@@ -15,7 +15,7 @@*/ #include <stdint.h> -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD #include <sys/endian.h> #else #include <endian.h>
lib/librte_eal/common/include/rte_string_fns.h +2 -2
@@ -74,7 +74,7 @@ rte_strlcat(char *dst, const char *src, size_t size) }/* pull in a strlcpy function */ -#ifdef RTE_EXEC_ENV_BSDAPP +#ifdef RTE_EXEC_ENV_FREEBSD #ifndef __BSD_VISIBLE/* non-standard functions are hidden */ #define strlcpy (dst, src, size) rte_strlcpy(dst, src, size)#define strlcat (dst, src, size) rte_strlcat(dst, src, size)
@@ -89,7 +89,7 @@ rte_strlcat(char *dst, const char *src, size_t size)#define strlcat (dst, src, size) rte_strlcat(dst, src, size)#endif /* RTE_USE_LIBBSD */ -#endif /* BSDAPP */ +#endif /* FREEBSD */ /** * Copy string src to buffer dst of size dsize.
lib/librte_eal/freebsd/Makefile +1 -1
@@ -3,6 +3,6 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += eal +DIRS-$(CONFIG_RTE_EXEC_ENV_FREEBSD) += eal include $(RTE_SDK)/mk/rte.subdir.mk
lib/librte_eal/freebsd/eal/Makefile +46 -46
108 lines not on this page · raw message
lib/librte_eal/meson.build +1 -1
@@ -14,7 +14,7 @@ if host_machine.system() == 'linux' subdir('linux/eal') elif host_machine.system() == 'freebsd' - dpdk_conf.set('RTE_EXEC_ENV_BSDAPP', 1) + dpdk_conf.set('RTE_EXEC_ENV_FREEBSD', 1) subdir('freebsd/eal') else
Signature · 1 line
2.20.1
PATCH 5/6 build/meson: change linuxapp to linux in meson cross files
In reply to Bruce RichardsonRename the cross files for meson compilation from having linuxapp in the name to just linux in the name.
---
.../arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} | 0
.../arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} | 0
config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} | 0
.../{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} | 0
devtools/test-meson-builds.sh | 2 +-
doc/build-sdk-meson.txt | 4 ++--
6 files changed, 3 insertions(+), 3 deletions(-)
rename config/arm/{arm64_armv8_linuxapp_gcc => arm64_armv8_linux_gcc} (100%)
rename config/arm/{arm64_dpaa2_linuxapp_gcc => arm64_dpaa2_linux_gcc} (100%)
rename config/arm/{arm64_dpaa_linuxapp_gcc => arm64_dpaa_linux_gcc} (100%)
rename config/arm/{arm64_thunderx_linuxapp_gcc => arm64_thunderx_linux_gcc} (100%)config/arm/arm64_armv8_linux_gcc renamed from config/arm/arm64_armv8_linuxapp_gcc +0 -0
config/arm/arm64_dpaa2_linux_gcc renamed from config/arm/arm64_dpaa2_linuxapp_gcc +0 -0
config/arm/arm64_dpaa_linux_gcc renamed from config/arm/arm64_dpaa_linuxapp_gcc +0 -0
config/arm/arm64_thunderx_linux_gcc renamed from config/arm/arm64_thunderx_linuxapp_gcc +0 -0
devtools/test-meson-builds.sh +1 -1
@@ -51,7 +51,7 @@ if command -v $c >/dev/null 2>&1 ; then # compile the general v8a also for clang to increase coverage export CC="ccache clang" build build-arm64-host-clang $use_shared \ - --cross-file config/arm/arm64_armv8_linuxapp_gcc + --cross-file config/arm/arm64_armv8_linux_gcc for f in config/arm/arm*gcc ; do export CC="ccache gcc"
doc/build-sdk-meson.txt +2 -2
@@ -157,9 +157,9 @@ command:: For example if the target machine is arm64 we can use the following command:: - meson arm-build --cross-file config/arm/arm64_armv8_linuxapp_gcc + meson arm-build --cross-file config/arm/arm64_armv8_linux_gcc -where config/arm/arm64_armv8_linuxapp_gcc contains the following +where config/arm/arm64_armv8_linux_gcc contains the following parameters:: [binaries]
Signature · 1 line
2.20.1
PATCH 6/6 build: allow linux and freebsd in build configs
In reply to Bruce RichardsonRather 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.
---
app/test-bbdev/test-bbdev.py | 2 +-
app/test/autotest.py | 2 +-
app/test/test.c | 2 +-
...on_armv8a_linuxapp => common_armv8a_linux} | 2 +-
config/{common_bsdapp => common_freebsd} | 0
config/{common_linuxapp => common_linux} | 0
config/defconfig_arm-armv7a-linux-gcc | 1 +
config/defconfig_arm-armv7a-linuxapp-gcc | 2 +-
config/defconfig_arm64-armv8a-linux-clang | 1 +
config/defconfig_arm64-armv8a-linux-gcc | 1 +
config/defconfig_arm64-armv8a-linuxapp-clang | 2 +-
config/defconfig_arm64-armv8a-linuxapp-gcc | 2 +-
config/defconfig_arm64-bluefield-linux-gcc | 1 +
config/defconfig_arm64-bluefield-linuxapp-gcc | 2 +-
config/defconfig_arm64-dpaa-linux-gcc | 1 +
config/defconfig_arm64-dpaa-linuxapp-gcc | 2 +-
config/defconfig_arm64-dpaa2-linux-gcc | 1 +
config/defconfig_arm64-dpaa2-linuxapp-gcc | 2 +-
config/defconfig_arm64-stingray-linux-gcc | 1 +
config/defconfig_arm64-stingray-linuxapp-gcc | 2 +-
config/defconfig_arm64-thunderx-linux-gcc | 1 +
config/defconfig_arm64-thunderx-linuxapp-gcc | 2 +-
config/defconfig_arm64-xgene1-linux-gcc | 1 +
config/defconfig_arm64-xgene1-linuxapp-gcc | 2 +-
config/defconfig_i686-native-linux-gcc | 1 +
config/defconfig_i686-native-linux-icc | 1 +
config/defconfig_i686-native-linuxapp-gcc | 2 +-
config/defconfig_i686-native-linuxapp-icc | 2 +-
config/defconfig_ppc_64-power8-linux-gcc | 1 +
config/defconfig_ppc_64-power8-linuxapp-gcc | 2 +-
config/defconfig_x86_64-native-bsdapp-clang | 2 +-
config/defconfig_x86_64-native-bsdapp-gcc | 2 +-
config/defconfig_x86_64-native-freebsd-clang | 1 +
config/defconfig_x86_64-native-freebsd-gcc | 1 +
config/defconfig_x86_64-native-linux-clang | 1 +
config/defconfig_x86_64-native-linux-gcc | 1 +
config/defconfig_x86_64-native-linux-icc | 1 +
config/defconfig_x86_64-native-linuxapp-clang | 2 +-
config/defconfig_x86_64-native-linuxapp-gcc | 2 +-
config/defconfig_x86_64-native-linuxapp-icc | 2 +-
config/defconfig_x86_x32-native-linux-gcc | 1 +
config/defconfig_x86_x32-native-linuxapp-gcc | 2 +-
devtools/build-tags.sh | 8 ++---
devtools/test-build.sh | 2 +-
devtools/validate-abi.sh | 2 +-
doc/build-sdk-quick.txt | 2 +-
doc/guides/compressdevs/octeontx.rst | 4 +--
doc/guides/contributing/design.rst | 6 ++--
doc/guides/contributing/patches.rst | 14 ++++----
doc/guides/contributing/versioning.rst | 6 ++--
doc/guides/cryptodevs/armv8.rst | 2 +-
doc/guides/cryptodevs/caam_jr.rst | 6 ++--
doc/guides/cryptodevs/dpaa2_sec.rst | 2 +-
doc/guides/cryptodevs/dpaa_sec.rst | 2 +-
doc/guides/cryptodevs/openssl.rst | 2 +-
doc/guides/cryptodevs/virtio.rst | 8 ++---
doc/guides/cryptodevs/zuc.rst | 2 +-
doc/guides/eventdevs/dpaa.rst | 2 +-
doc/guides/eventdevs/dpaa2.rst | 2 +-
doc/guides/eventdevs/octeontx.rst | 2 +-
doc/guides/freebsd_gsg/build_dpdk.rst | 6 ++--
doc/guides/freebsd_gsg/build_sample_apps.rst | 10 +++---
doc/guides/freebsd_gsg/install_from_ports.rst | 4 +--
doc/guides/freebsd_gsg/intro.rst | 4 +--
doc/guides/howto/lm_bond_virtio_sriov.rst | 4 +--
doc/guides/howto/lm_virtio_vhost_user.rst | 4 +--
doc/guides/howto/pvp_reference_benchmark.rst | 4 +--
.../virtio_user_for_container_networking.rst | 4 +--
doc/guides/linux_gsg/build_dpdk.rst | 10 +++---
doc/guides/linux_gsg/build_sample_apps.rst | 6 ++--
.../linux_gsg/cross_build_dpdk_for_arm64.rst | 6 ++--
doc/guides/linux_gsg/intro.rst | 4 +--
.../linux_gsg/nic_perf_intel_platform.rst | 2 +-
doc/guides/linux_gsg/quick_start.rst | 26 +++++++-------
doc/guides/mempool/octeontx.rst | 2 +-
doc/guides/nics/build_and_test.rst | 34 +++++++++----------
doc/guides/nics/cxgbe.rst | 6 ++--
doc/guides/nics/dpaa.rst | 2 +-
doc/guides/nics/enic.rst | 2 +-
doc/guides/nics/intel_vf.rst | 10 +++---
doc/guides/nics/mlx5.rst | 2 +-
doc/guides/nics/mvneta.rst | 2 +-
doc/guides/nics/mvpp2.rst | 4 +--
doc/guides/nics/nfp.rst | 2 +-
doc/guides/nics/octeontx.rst | 4 +--
doc/guides/nics/softnic.rst | 4 +--
doc/guides/nics/tap.rst | 2 +-
doc/guides/nics/thunderx.rst | 4 +--
doc/guides/platform/octeontx.rst | 6 ++--
doc/guides/prog_guide/build_app.rst | 4 +--
.../prog_guide/dev_kit_build_system.rst | 8 ++---
.../prog_guide/dev_kit_root_make_help.rst | 6 ++--
.../prog_guide/env_abstraction_layer.rst | 6 ++--
.../prog_guide/ext_app_lib_make_help.rst | 4 +--
doc/guides/prog_guide/extend_dpdk.rst | 4 +--
doc/guides/prog_guide/glossary.rst | 2 +-
doc/guides/prog_guide/img/linuxapp_launch.svg | 4 +--
doc/guides/prog_guide/intro.rst | 2 +-
doc/guides/prog_guide/overview.rst | 2 +-
doc/guides/prog_guide/profile_app.rst | 2 +-
doc/guides/prog_guide/qos_framework.rst | 2 +-
doc/guides/rawdevs/dpaa2_cmdif.rst | 2 +-
doc/guides/rawdevs/dpaa2_qdma.rst | 2 +-
doc/guides/rel_notes/release_19_02.rst | 2 +-
doc/guides/rel_notes/release_2_1.rst | 2 +-
doc/guides/sample_app_ug/bbdev_app.rst | 6 ++--
doc/guides/sample_app_ug/cmd_line.rst | 2 +-
doc/guides/sample_app_ug/dist_app.rst | 2 +-
doc/guides/sample_app_ug/fips_validation.rst | 4 +--
doc/guides/sample_app_ug/flow_classify.rst | 2 +-
doc/guides/sample_app_ug/flow_filtering.rst | 4 +--
doc/guides/sample_app_ug/hello_world.rst | 4 +--
doc/guides/sample_app_ug/ip_frag.rst | 4 +--
doc/guides/sample_app_ug/ip_reassembly.rst | 4 +--
doc/guides/sample_app_ug/keep_alive.rst | 2 +-
.../sample_app_ug/kernel_nic_interface.rst | 2 +-
doc/guides/sample_app_ug/l2_forward_cat.rst | 2 +-
.../sample_app_ug/l2_forward_crypto.rst | 2 +-
.../sample_app_ug/l2_forward_job_stats.rst | 2 +-
.../sample_app_ug/l2_forward_real_virtual.rst | 2 +-
doc/guides/sample_app_ug/link_status_intr.rst | 2 +-
.../sample_app_ug/netmap_compatibility.rst | 2 +-
.../sample_app_ug/performance_thread.rst | 2 +-
doc/guides/sample_app_ug/ptpclient.rst | 4 +--
doc/guides/sample_app_ug/qos_scheduler.rst | 2 +-
doc/guides/sample_app_ug/quota_watermark.rst | 4 +--
doc/guides/sample_app_ug/rxtx_callbacks.rst | 2 +-
doc/guides/sample_app_ug/service_cores.rst | 2 +-
doc/guides/sample_app_ug/skeleton.rst | 2 +-
doc/guides/sample_app_ug/tep_termination.rst | 2 +-
doc/guides/sample_app_ug/timer.rst | 2 +-
.../sample_app_ug/vmdq_dcb_forwarding.rst | 4 +--
doc/guides/testpmd_app_ug/build_app.rst | 2 +-
doc/guides/tools/testbbdev.rst | 8 ++---
drivers/net/softnic/Makefile | 2 +-
examples/Makefile | 2 +-
examples/bbdev_app/Makefile | 2 +-
examples/bond/Makefile | 2 +-
examples/cmdline/Makefile | 2 +-
examples/distributor/Makefile | 2 +-
examples/ethtool/Makefile | 4 +--
examples/ethtool/ethtool-app/Makefile | 2 +-
examples/ethtool/lib/Makefile | 4 +--
examples/eventdev_pipeline/Makefile | 2 +-
examples/exception_path/Makefile | 2 +-
examples/fips_validation/Makefile | 2 +-
examples/flow_classify/Makefile | 2 +-
examples/flow_filtering/Makefile | 2 +-
examples/helloworld/Makefile | 2 +-
examples/ip_fragmentation/Makefile | 2 +-
examples/ip_pipeline/Makefile | 4 +--
examples/ip_reassembly/Makefile | 2 +-
examples/ipsec-secgw/Makefile | 2 +-
examples/ipsec-secgw/test/common_defs.sh | 2 +-
examples/ipv4_multicast/Makefile | 2 +-
examples/kni/Makefile | 4 +--
examples/l2fwd-cat/Makefile | 2 +-
examples/l2fwd-crypto/Makefile | 2 +-
examples/l2fwd-jobstats/Makefile | 2 +-
examples/l2fwd-keepalive/Makefile | 2 +-
examples/l2fwd-keepalive/ka-agent/Makefile | 2 +-
examples/l2fwd/Makefile | 2 +-
examples/l3fwd-acl/Makefile | 2 +-
examples/l3fwd-power/Makefile | 4 +--
examples/l3fwd-vf/Makefile | 2 +-
examples/l3fwd/Makefile | 2 +-
examples/link_status_interrupt/Makefile | 2 +-
examples/load_balancer/Makefile | 2 +-
examples/multi_process/Makefile | 2 +-
.../multi_process/client_server_mp/Makefile | 2 +-
.../client_server_mp/mp_server/Makefile | 4 +--
examples/multi_process/hotplug_mp/Makefile | 2 +-
examples/multi_process/simple_mp/Makefile | 2 +-
examples/multi_process/symmetric_mp/Makefile | 2 +-
examples/netmap_compat/Makefile | 2 +-
examples/netmap_compat/bridge/Makefile | 4 +--
examples/packet_ordering/Makefile | 2 +-
examples/performance-thread/Makefile | 2 +-
.../performance-thread/l3fwd-thread/Makefile | 2 +-
.../performance-thread/pthread_shim/Makefile | 2 +-
examples/ptpclient/Makefile | 2 +-
examples/qos_meter/Makefile | 2 +-
examples/qos_sched/Makefile | 4 +--
examples/quota_watermark/Makefile | 2 +-
examples/quota_watermark/qw/Makefile | 2 +-
examples/quota_watermark/qwctl/Makefile | 2 +-
examples/rxtx_callbacks/Makefile | 2 +-
examples/server_node_efd/Makefile | 2 +-
examples/server_node_efd/server/Makefile | 4 +--
examples/service_cores/Makefile | 2 +-
examples/skeleton/Makefile | 2 +-
examples/tep_termination/Makefile | 4 +--
examples/timer/Makefile | 2 +-
examples/vdpa/Makefile | 4 +--
examples/vhost/Makefile | 4 +--
examples/vhost_crypto/Makefile | 4 +--
examples/vhost_scsi/Makefile | 4 +--
examples/vm_power_manager/Makefile | 2 +-
examples/vm_power_manager/guest_cli/Makefile | 2 +-
examples/vmdq/Makefile | 2 +-
examples/vmdq_dcb/Makefile | 2 +-
lib/librte_eal/common/include/rte_debug.h | 2 +-
lib/librte_eal/common/include/rte_eal.h | 2 +-
lib/librte_eal/freebsd/eal/Makefile | 4 +--
lib/librte_eal/linux/eal/Makefile | 2 +-
mk/exec-env/bsdapp | 1 +
mk/exec-env/{bsdapp => freebsd}/rte.app.mk | 0
mk/exec-env/{bsdapp => freebsd}/rte.vars.mk | 2 +-
mk/exec-env/{linuxapp => linux}/rte.app.mk | 0
mk/exec-env/{linuxapp => linux}/rte.vars.mk | 2 +-
mk/exec-env/linuxapp | 1 +
mk/rte.sdkconfig.mk | 9 ++---
mk/rte.sdkinstall.mk | 3 ++
mk/rte.sdkroot.mk | 2 +-
usertools/dpdk-setup.sh | 4 +--
215 files changed, 337 insertions(+), 313 deletions(-)
rename config/{common_armv8a_linuxapp => common_armv8a_linux} (97%)
rename config/{common_bsdapp => common_freebsd} (100%)
rename config/{common_linuxapp => common_linux} (100%)
create mode 120000 config/defconfig_arm-armv7a-linux-gcc
create mode 120000 config/defconfig_arm64-armv8a-linux-clang
create mode 120000 config/defconfig_arm64-armv8a-linux-gcc
create mode 120000 config/defconfig_arm64-bluefield-linux-gcc
create mode 120000 config/defconfig_arm64-dpaa-linux-gcc
create mode 120000 config/defconfig_arm64-dpaa2-linux-gcc
create mode 120000 config/defconfig_arm64-stingray-linux-gcc
create mode 120000 config/defconfig_arm64-thunderx-linux-gcc
create mode 120000 config/defconfig_arm64-xgene1-linux-gcc
create mode 120000 config/defconfig_i686-native-linux-gcc
create mode 120000 config/defconfig_i686-native-linux-icc
create mode 120000 config/defconfig_ppc_64-power8-linux-gcc
create mode 120000 config/defconfig_x86_64-native-freebsd-clang
create mode 120000 config/defconfig_x86_64-native-freebsd-gcc
create mode 120000 config/defconfig_x86_64-native-linux-clang
create mode 120000 config/defconfig_x86_64-native-linux-gcc
create mode 120000 config/defconfig_x86_64-native-linux-icc
create mode 120000 config/defconfig_x86_x32-native-linux-gcc
create mode 120000 mk/exec-env/bsdapp
rename mk/exec-env/{bsdapp => freebsd}/rte.app.mk (100%)
rename mk/exec-env/{bsdapp => freebsd}/rte.vars.mk (94%)
rename mk/exec-env/{linuxapp => linux}/rte.app.mk (100%)
rename mk/exec-env/{linuxapp => linux}/rte.vars.mk (95%)
create mode 120000 mk/exec-env/linuxappapp/test-bbdev/test-bbdev.py +1 -1
@@ -23,7 +23,7 @@ def kill(process): 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',
app/test/autotest.py +1 -1
@@ -38,7 +38,7 @@ def usage(): # 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)
app/test/test.c +1 -1
@@ -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 ; }
config/common_armv8a_linux renamed from config/common_armv8a_linuxapp +1 -1
@@ -2,7 +2,7 @@ # Copyright(c) 2017 Cavium, Inc # -#include "common_linuxapp" +#include "common_linux" CONFIG_RTE_MACHINE="armv8a"
config/common_freebsd renamed from config/common_bsdapp +0 -0
config/common_linux renamed from config/common_linuxapp +0 -0
config/defconfig_arm-armv7a-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm-armv7a-linuxapp-gcc
config/defconfig_arm-armv7a-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_arm64-armv8a-linux-clang new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-armv8a-linuxapp-clang
config/defconfig_arm64-armv8a-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-armv8a-linuxapp-gcc
config/defconfig_arm64-armv8a-linuxapp-clang +1 -1
@@ -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
config/defconfig_arm64-armv8a-linuxapp-gcc +1 -1
@@ -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
config/defconfig_arm64-bluefield-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-bluefield-linuxapp-gcc
config/defconfig_arm64-bluefield-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_arm64-dpaa-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-dpaa-linuxapp-gcc
config/defconfig_arm64-dpaa-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_arm64-dpaa2-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-dpaa2-linuxapp-gcc
config/defconfig_arm64-dpaa2-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_arm64-stingray-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-stingray-linuxapp-gcc
config/defconfig_arm64-stingray-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_arm64-thunderx-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-thunderx-linuxapp-gcc
config/defconfig_arm64-thunderx-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_arm64-xgene1-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_arm64-xgene1-linuxapp-gcc
config/defconfig_arm64-xgene1-linuxapp-gcc +1 -1
@@ -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
config/defconfig_i686-native-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_i686-native-linuxapp-gcc
config/defconfig_i686-native-linux-icc new file +1 -0
@@ -0,0 +1 @@ +defconfig_i686-native-linuxapp-icc
config/defconfig_i686-native-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_i686-native-linuxapp-icc +1 -1
@@ -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"
config/defconfig_ppc_64-power8-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_ppc_64-power8-linuxapp-gcc
config/defconfig_ppc_64-power8-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_x86_64-native-bsdapp-clang +1 -1
@@ -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"
config/defconfig_x86_64-native-bsdapp-gcc +1 -1
@@ -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"
config/defconfig_x86_64-native-freebsd-clang new file +1 -0
@@ -0,0 +1 @@ +defconfig_x86_64-native-bsdapp-clang
config/defconfig_x86_64-native-freebsd-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_x86_64-native-bsdapp-gcc
config/defconfig_x86_64-native-linux-clang new file +1 -0
@@ -0,0 +1 @@ +defconfig_x86_64-native-linuxapp-clang
config/defconfig_x86_64-native-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_x86_64-native-linuxapp-gcc
config/defconfig_x86_64-native-linux-icc new file +1 -0
@@ -0,0 +1 @@ +defconfig_x86_64-native-linuxapp-icc
config/defconfig_x86_64-native-linuxapp-clang +1 -1
@@ -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"
config/defconfig_x86_64-native-linuxapp-gcc +1 -1
@@ -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"
config/defconfig_x86_64-native-linuxapp-icc +1 -1
@@ -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"
config/defconfig_x86_x32-native-linux-gcc new file +1 -0
@@ -0,0 +1 @@ +defconfig_x86_x32-native-linuxapp-gcc
config/defconfig_x86_x32-native-linuxapp-gcc +1 -1
@@ -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"
devtools/build-tags.sh +4 -4
@@ -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
devtools/test-build.sh +1 -1
@@ -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 '~'.
devtools/validate-abi.sh +1 -1
@@ -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() {
doc/build-sdk-quick.txt +1 -1
@@ -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.
doc/guides/compressdevs/octeontx.rst +2 -2
@@ -68,7 +68,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - 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
doc/guides/contributing/design.rst +3 -3
@@ -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_<LIBRARY_NAME>_STATS_COLLECT=y/n The default value for this DPDK configuration file variable (either "yes" or
doc/guides/contributing/patches.rst +7 -7
@@ -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
doc/guides/contributing/versioning.rst +3 -3
@@ -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
doc/guides/cryptodevs/armv8.rst +1 -1
@@ -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:
doc/guides/cryptodevs/caam_jr.rst +3 -3
@@ -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 <DPDK-source-directory> - make config T=arm64-armv8a-linuxapp-gcc install + make config T=arm64-armv8a-linux-gcc install Enabling logs -------------
doc/guides/cryptodevs/dpaa2_sec.rst +1 -1
@@ -191,7 +191,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Enabling logs -------------
doc/guides/cryptodevs/dpaa_sec.rst +1 -1
@@ -131,7 +131,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-dpaa-linuxapp-gcc install + make config T=arm64-dpaa-linux-gcc install Enabling logs -------------
doc/guides/cryptodevs/openssl.rst +1 -1
@@ -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.
doc/guides/cryptodevs/virtio.rst +4 -4
@@ -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
doc/guides/cryptodevs/zuc.rst +1 -1
@@ -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
doc/guides/eventdevs/dpaa.rst +1 -1
@@ -62,7 +62,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-dpaa-linuxapp-gcc install + make config T=arm64-dpaa-linux-gcc install Initialization --------------
doc/guides/eventdevs/dpaa2.rst +1 -1
@@ -71,7 +71,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Initialization --------------
doc/guides/eventdevs/octeontx.rst +1 -1
@@ -63,7 +63,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-thunderx-linuxapp-gcc install + make config T=arm64-thunderx-linux-gcc install Initialization
doc/guides/freebsd_gsg/build_dpdk.rst +3 -3
@@ -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
doc/guides/freebsd_gsg/build_sample_apps.rst +5 -5
@@ -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
doc/guides/freebsd_gsg/install_from_ports.rst +2 -2
@@ -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 .
doc/guides/freebsd_gsg/intro.rst +2 -2
@@ -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
doc/guides/howto/lm_bond_virtio_sriov.rst +2 -2
@@ -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:
doc/guides/howto/lm_virtio_vhost_user.rst +2 -2
@@ -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
doc/guides/howto/pvp_reference_benchmark.rst +2 -2
@@ -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
doc/guides/howto/virtio_user_for_container_networking.rst +2 -2
@@ -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.
doc/guides/linux_gsg/build_dpdk.rst +5 -5
@@ -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=<target>`` 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
doc/guides/linux_gsg/build_sample_apps.rst +3 -3
@@ -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
doc/guides/linux_gsg/cross_build_dpdk_for_arm64.rst +3 -3
@@ -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
doc/guides/linux_gsg/intro.rst +2 -2
@@ -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
doc/guides/linux_gsg/nic_perf_intel_platform.rst +1 -1
@@ -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
doc/guides/linux_gsg/quick_start.rst +13 -13
@@ -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.
doc/guides/mempool/octeontx.rst +1 -1
@@ -56,7 +56,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-thunderx-linuxapp-gcc + make config T=arm64-thunderx-linux-gcc Initialization
doc/guides/nics/build_and_test.rst +17 -17
@@ -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
doc/guides/nics/cxgbe.rst +3 -3
@@ -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:
doc/guides/nics/dpaa.rst +1 -1
@@ -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 .....
doc/guides/nics/enic.rst +1 -1
@@ -572,7 +572,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.
doc/guides/nics/intel_vf.rst +5 -5
@@ -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::
doc/guides/nics/mlx5.rst +1 -1
@@ -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.
doc/guides/nics/mvneta.rst +1 -1
@@ -133,7 +133,7 @@ the path to the MUSDK installation directory needs to be exported. export LIBMUSDK_PATH=<musdk>/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
doc/guides/nics/mvpp2.rst +2 -2
@@ -180,9 +180,9 @@ For additional instructions regarding DPDK cross compilation please refer to :do export LIBMUSDK_PATH=<musdk>/usr/local export CROSS=<toolchain>/bin/aarch64-linux-gnu- export RTE_KERNELDIR=<kernel-dir> - 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
doc/guides/nics/nfp.rst +1 -1
@@ -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**
doc/guides/nics/octeontx.rst +2 -2
@@ -71,7 +71,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - 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' \
doc/guides/nics/softnic.rst +2 -2
@@ -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, \
doc/guides/nics/tap.rst +1 -1
@@ -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 \
doc/guides/nics/thunderx.rst +2 -2
@@ -70,7 +70,7 @@ Refer to the document :ref:`compiling and testing a PMD for a NIC <pmd_build_and for details. To compile the ThunderX NICVF PMD for Linux arm64 gcc, -use arm64-thunderx-linuxapp-gcc as target. +use arm64-thunderx-linux-gcc as target. Linux -----
@@ -177,7 +177,7 @@ This section provides instructions to configure SR-IOV with Linux OS. .. code-block:: console - ./arm64-thunderx-linuxapp-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ + ./arm64-thunderx-linux-gcc/app/testpmd -l 0-3 -n 4 -w 0002:01:00.2 \ -- -i --no-flush-rx \ --port-topology=loop
doc/guides/platform/octeontx.rst +3 -3
@@ -95,7 +95,7 @@ drivers can be compiled with the following steps, .. code-block:: console cd <dpdk directory> - 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 <dpdk directory> 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 <numa_install_dir>/include" EXTRA_LDFLAGS="-L<numa_install_dir>/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-
doc/guides/prog_guide/build_app.rst +2 -2
@@ -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
doc/guides/prog_guide/dev_kit_build_system.rst +4 -4
@@ -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
@@ -248,7 +248,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.
doc/guides/prog_guide/dev_kit_root_make_help.rst +3 -3
@@ -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
doc/guides/prog_guide/env_abstraction_layer.rst +2 -2
@@ -54,9 +54,9 @@ 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.* EAL Initialization in a Linux Application Environment
@@ -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 <Multi-process_Support>` for more details.
doc/guides/prog_guide/ext_app_lib_make_help.rst +2 -2
@@ -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
doc/guides/prog_guide/extend_dpdk.rst +2 -2
@@ -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
doc/guides/prog_guide/glossary.rst +1 -1
@@ -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
doc/guides/prog_guide/img/linuxapp_launch.svg +2 -2
@@ -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">
doc/guides/prog_guide/intro.rst +1 -1
@@ -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)
doc/guides/prog_guide/overview.rst +1 -1
@@ -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.
doc/guides/prog_guide/profile_app.rst +1 -1
@@ -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
doc/guides/prog_guide/qos_framework.rst +1 -1
@@ -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)
doc/guides/rawdevs/dpaa2_cmdif.rst +1 -1
@@ -77,7 +77,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Initialization --------------
doc/guides/rawdevs/dpaa2_qdma.rst +1 -1
@@ -81,7 +81,7 @@ following ``make`` command: .. code-block:: console cd <DPDK-source-directory> - make config T=arm64-dpaa2-linuxapp-gcc install + make config T=arm64-dpaa2-linux-gcc install Initialization --------------
doc/guides/rel_notes/release_19_02.rst +1 -1
@@ -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.**
doc/guides/rel_notes/release_2_1.rst +1 -1
@@ -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.
doc/guides/sample_app_ug/bbdev_app.rst +3 -3
@@ -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 <NIC1PCIADDR> -- -m 1.0 -P where:
doc/guides/sample_app_ug/cmd_line.rst +1 -1
@@ -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
doc/guides/sample_app_ug/dist_app.rst +1 -1
@@ -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
doc/guides/sample_app_ug/fips_validation.rst +2 -2
@@ -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
doc/guides/sample_app_ug/flow_classify.rst +1 -1
@@ -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
doc/guides/sample_app_ug/flow_filtering.rst +2 -2
@@ -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
doc/guides/sample_app_ug/hello_world.rst +2 -2
@@ -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.
doc/guides/sample_app_ug/ip_frag.rst +2 -2
@@ -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
doc/guides/sample_app_ug/ip_reassembly.rst +2 -2
@@ -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
doc/guides/sample_app_ug/keep_alive.rst +1 -1
@@ -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
doc/guides/sample_app_ug/kernel_nic_interface.rst +1 -1
@@ -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 -----------------------------------
doc/guides/sample_app_ug/l2_forward_cat.rst +1 -1
@@ -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
doc/guides/sample_app_ug/l2_forward_crypto.rst +1 -1
@@ -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
doc/guides/sample_app_ug/l2_forward_job_stats.rst +1 -1
@@ -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
doc/guides/sample_app_ug/l2_forward_real_virtual.rst +1 -1
@@ -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
doc/guides/sample_app_ug/link_status_intr.rst +1 -1
@@ -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
doc/guides/sample_app_ug/netmap_compatibility.rst +1 -1
@@ -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
doc/guides/sample_app_ug/performance_thread.rst +1 -1
@@ -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.
doc/guides/sample_app_ug/ptpclient.rst +2 -2
@@ -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
doc/guides/sample_app_ug/qos_scheduler.rst +1 -1
@@ -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::
doc/guides/sample_app_ug/quota_watermark.rst +2 -2
@@ -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
doc/guides/sample_app_ug/rxtx_callbacks.rst +1 -1
@@ -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
doc/guides/sample_app_ug/service_cores.rst +1 -1
@@ -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.
doc/guides/sample_app_ug/skeleton.rst +1 -1
@@ -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
doc/guides/sample_app_ug/tep_termination.rst +1 -1
@@ -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
doc/guides/sample_app_ug/timer.rst +1 -1
@@ -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
doc/guides/sample_app_ug/vmdq_dcb_forwarding.rst +2 -2
@@ -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.
doc/guides/testpmd_app_ug/build_app.rst +1 -1
@@ -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:
doc/guides/tools/testbbdev.rst +4 -4
@@ -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
drivers/net/softnic/Makefile +1 -1
@@ -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:
examples/Makefile +1 -1
@@ -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
examples/bbdev_app/Makefile +1 -1
@@ -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
examples/bond/Makefile +1 -1
@@ -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
examples/cmdline/Makefile +1 -1
@@ -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
examples/distributor/Makefile +1 -1
@@ -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
examples/ethtool/Makefile +2 -2
@@ -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
examples/ethtool/ethtool-app/Makefile +1 -1
@@ -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
examples/ethtool/lib/Makefile +2 -2
@@ -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
examples/eventdev_pipeline/Makefile +1 -1
@@ -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
examples/exception_path/Makefile +1 -1
@@ -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
examples/fips_validation/Makefile +1 -1
@@ -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))
examples/flow_classify/Makefile +1 -1
@@ -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
examples/flow_filtering/Makefile +1 -1
@@ -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
examples/helloworld/Makefile +1 -1
@@ -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
examples/ip_fragmentation/Makefile +1 -1
@@ -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
examples/ip_pipeline/Makefile +2 -2
@@ -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:
examples/ip_reassembly/Makefile +1 -1
@@ -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
examples/ipsec-secgw/Makefile +1 -1
@@ -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
examples/ipsec-secgw/test/common_defs.sh +1 -1
@@ -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
examples/ipv4_multicast/Makefile +1 -1
@@ -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
examples/kni/Makefile +2 -2
@@ -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
examples/l2fwd-cat/Makefile +1 -1
@@ -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
examples/l2fwd-crypto/Makefile +1 -1
@@ -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
examples/l2fwd-jobstats/Makefile +1 -1
@@ -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
examples/l2fwd-keepalive/Makefile +1 -1
@@ -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
examples/l2fwd-keepalive/ka-agent/Makefile +1 -1
@@ -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
examples/l2fwd/Makefile +1 -1
@@ -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
examples/l3fwd-acl/Makefile +1 -1
@@ -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
examples/l3fwd-power/Makefile +2 -2
@@ -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
examples/l3fwd-vf/Makefile +1 -1
@@ -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
examples/l3fwd/Makefile +1 -1
@@ -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
examples/link_status_interrupt/Makefile +1 -1
@@ -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
examples/load_balancer/Makefile +1 -1
@@ -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
examples/multi_process/Makefile +1 -1
@@ -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
examples/multi_process/client_server_mp/Makefile +1 -1
@@ -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
examples/multi_process/client_server_mp/mp_server/Makefile +2 -2
@@ -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
examples/multi_process/hotplug_mp/Makefile +1 -1
@@ -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
examples/multi_process/simple_mp/Makefile +1 -1
@@ -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
examples/multi_process/symmetric_mp/Makefile +1 -1
@@ -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
examples/netmap_compat/Makefile +1 -1
@@ -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
examples/netmap_compat/bridge/Makefile +2 -2
@@ -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:
examples/packet_ordering/Makefile +1 -1
@@ -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
examples/performance-thread/Makefile +1 -1
@@ -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
examples/performance-thread/l3fwd-thread/Makefile +1 -1
@@ -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
examples/performance-thread/pthread_shim/Makefile +1 -1
@@ -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
examples/ptpclient/Makefile +1 -1
@@ -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
examples/qos_meter/Makefile +1 -1
@@ -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
examples/qos_sched/Makefile +2 -2
@@ -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:
examples/quota_watermark/Makefile +1 -1
@@ -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
examples/quota_watermark/qw/Makefile +1 -1
@@ -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
examples/quota_watermark/qwctl/Makefile +1 -1
@@ -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
examples/rxtx_callbacks/Makefile +1 -1
@@ -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
examples/server_node_efd/Makefile +1 -1
@@ -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
examples/server_node_efd/server/Makefile +2 -2
@@ -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
examples/service_cores/Makefile +1 -1
@@ -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
examples/skeleton/Makefile +1 -1
@@ -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
examples/tep_termination/Makefile +2 -2
@@ -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
examples/timer/Makefile +1 -1
@@ -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
examples/vdpa/Makefile +2 -2
@@ -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
examples/vhost/Makefile +2 -2
@@ -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
examples/vhost_crypto/Makefile +2 -2
@@ -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
examples/vhost_scsi/Makefile +2 -2
@@ -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
examples/vm_power_manager/Makefile +1 -1
@@ -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
examples/vm_power_manager/guest_cli/Makefile +1 -1
@@ -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
examples/vmdq/Makefile +1 -1
@@ -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
examples/vmdq_dcb/Makefile +1 -1
@@ -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
lib/librte_eal/common/include/rte_debug.h +1 -1
@@ -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.
lib/librte_eal/common/include/rte_eal.h +1 -1
@@ -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 */
lib/librte_eal/freebsd/eal/Makefile +2 -2
@@ -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))
lib/librte_eal/linux/eal/Makefile +1 -1
@@ -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
mk/exec-env/bsdapp new file +1 -0
@@ -0,0 +1 @@ +freebsd/
mk/exec-env/freebsd/rte.app.mk renamed from mk/exec-env/bsdapp/rte.app.mk +0 -0
mk/exec-env/freebsd/rte.vars.mk renamed from mk/exec-env/bsdapp/rte.vars.mk +1 -1
@@ -9,7 +9,7 @@ # - define EXECENV_ASFLAGS variable (overridden by cmdline) # - may override any previously defined variable # -# examples for RTE_EXEC_ENV: linuxapp, bsdapp +# examples for RTE_EXEC_ENV: linux, freebsd # ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC
mk/exec-env/linux/rte.app.mk renamed from mk/exec-env/linuxapp/rte.app.mk +0 -0
mk/exec-env/linux/rte.vars.mk renamed from mk/exec-env/linuxapp/rte.vars.mk +1 -1
@@ -9,7 +9,7 @@ # - define EXECENV_ASFLAGS variable (overridden by cmdline) # - may override any previously defined variable # -# examples for RTE_EXEC_ENV: linuxapp, bsdapp +# examples for RTE_EXEC_ENV: linux, freebsd # ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),y) EXECENV_CFLAGS = -pthread -fPIC
mk/exec-env/linuxapp new file +1 -0
@@ -0,0 +1 @@ +linux/
mk/rte.sdkconfig.mk +5 -4
@@ -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 \ '{ \
mk/rte.sdkinstall.mk +3 -0
@@ -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
mk/rte.sdkroot.mk +1 -1
@@ -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
usertools/dpdk-setup.sh +2 -2
@@ -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"
Signature · 1 line
2.20.1
06/03/2019 17:22, Bruce Richardson:
Quoted 13 lines
The terms linuxapp and bsdapp are legacy names in DPDK that are equivalent to the more usual names of "linux" and "freebsd". Therefore, we can replace the instances of the "app" names with the more usual variants. The only issue in maintaining backward compatibility which can be done by preserving a) the build config filenames and b) the macros defined for the build. In both cases, new configs/macros are added while keeping the old for compatiblity.
The first 5 patches are relatively minor, internal changes, or changes for the newer meson system. Patch 6 is larger in size as it changes the make build system which has far greater use of the names linuxapp and bsdapp.
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configs
I agree on the idea.
If no issue is found, I'll apply it shortly to avoid too many rebase issue. If someone is against, please shout before Tuesday.
Thomas Monjalon
AppliedQuoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configs
Applied, thanks
Quoted 9 lines · Thomas Monjalon
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...
I suggest highlighting this change in release notes!
13/03/2019 14:41, Ferruh Yigit:
Quoted 9 lines · Thomas Monjalon
Quoted 8 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configs
Quoted 8 lines
Quoted 1 line
Applied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!
Quoted 17 lines · Thomas Monjalon
13/03/2019 14:41, Ferruh Yigit:
Quoted 16 lines · Thomas Monjalon
Quoted 9 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...
Quoted 5 lines
Quoted 1 line
I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!
Ah, right config is working, how I hit this is:
$ make T=x86_64-native-linuxapp-gcc cscope Invalid config: x86_64-native-linuxapp-gcc
'cscope' (and friends) also should be covered ...
Quoted 24 lines · Ferruh Yigit
Quoted 17 lines · Thomas Monjalon
13/03/2019 14:41, Ferruh Yigit:
Quoted 16 lines · Thomas Monjalon
Quoted 9 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...Quoted 5 lines
Quoted 1 line
I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!
Quoted 6 lines
Ah, right config is working, how I hit this is:
$ make T=x86_64-native-linuxapp-gcc cscope Invalid config: x86_64-native-linuxapp-gcc'cscope' (and friends) also should be covered ...
Strange, because the new configs are just symlinks to the old. I'll need to investigate how cscope and friends use the config.
/Bruce
Quoted 27 lines · Bruce Richardson
Quoted 26 lines · Ferruh Yigit
Quoted 17 lines · Thomas Monjalon
13/03/2019 14:41, Ferruh Yigit:
Quoted 16 lines · Thomas Monjalon
Quoted 9 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...Quoted 5 lines
Quoted 1 line
I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!Ah, right config is working, how I hit this is:
Quoted 7 lines
Quoted 4 lines
$ make T=x86_64-native-linuxapp-gcc cscope Invalid config: x86_64-native-linuxapp-gcc'cscope' (and friends) also should be covered ...
Strange, because the new configs are just symlinks to the old. I'll need to investigate how cscope and friends use the config.
Are we allowed to use symlinks J Will they play nice on windows?
Quoted 31 lines · Ferruh Yigit
Quoted 30 lines · Bruce Richardson
Quoted 29 lines · Ferruh Yigit
Quoted 17 lines · Thomas Monjalon
13/03/2019 14:41, Ferruh Yigit:
Quoted 16 lines · Thomas Monjalon
Quoted 9 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...Quoted 5 lines
Quoted 1 line
I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!Ah, right config is working, how I hit this is:
$ make T=x86_64-native-linuxapp-gcc cscope Invalid config: x86_64-native-linuxapp-gcc
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
'cscope' (and friends) also should be covered ...
Strange, because the new configs are just symlinks to the old. I'll need to investigate how cscope and friends use the config.
Are we allowed to use symlinks J Will they play nice on windows?
They'll work well enough. Plus it's only for the old build system, so will go away in the future.
Quoted 24 lines · Ferruh Yigit
Quoted 17 lines · Thomas Monjalon
13/03/2019 14:41, Ferruh Yigit:
Quoted 16 lines · Thomas Monjalon
Quoted 9 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...Quoted 5 lines
Quoted 1 line
I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!
Quoted 6 lines
Ah, right config is working, how I hit this is:
$ make T=x86_64-native-linuxapp-gcc cscope Invalid config: x86_64-native-linuxapp-gcc'cscope' (and friends) also should be covered ...
Ok, the root cause of this is that even though the build-tags function does not use the config, it checks if the config parameter passed in is a valid one by running "make showconfig". This I changed to filter out the old configs so they are not advertised any more - though they still work - which causes build-tags to assume that the config is invalid.
I therefore suggest we fix this by changing the check for a valid config to check if there is a defconfig_ file with the same name rather than asking showconfig.
/Bruce
Quoted 38 lines · Bruce Richardson
Quoted 24 lines · Ferruh Yigit
Quoted 17 lines · Thomas Monjalon
13/03/2019 14:41, Ferruh Yigit:
Quoted 16 lines · Thomas Monjalon
Quoted 9 lines
Quoted 7 lines
Bruce Richardson (6):
eal/bsdapp: rename to freebsd
eal/linuxapp: rename to linux
build/linux: rename macro from LINUXAPP to LINUX build/freebsd: rename macro from BSDPAPP to FREEBSD build/meson: change linuxapp to linux in meson cross files
build: allow linux and freebsd in build configsApplied, thanks
This has potential to break some automation/scripts since changes the names of the config files:
'make T=x86_64-native-linuxapp-gcc config' becomes
'make T=x86_64-native-linux-gcc config' etc...Quoted 5 lines
Quoted 1 line
I suggest highlighting this change in release notes!
No, the old names should still work.
Otherwise, it would be an API breakage, which is very bad!Quoted 6 lines
Ah, right config is working, how I hit this is:
$ make T=x86_64-native-linuxapp-gcc cscope Invalid config: x86_64-native-linuxapp-gcc'cscope' (and friends) also should be covered ...
Ok, the root cause of this is that even though the build-tags function does not use the config, it checks if the config parameter passed in is a valid one by running "make showconfig". This I changed to filter out the old configs so they are not advertised any more - though they still work - which causes build-tags to assume that the config is invalid.
Quoted 4 lines
I therefore suggest we fix this by changing the check for a valid config to check if there is a
defconfig_file with the same name rather than asking showconfig.
http://patches.dpdk.org/patch/51155/
Please review.
Thanks,
/Bruce