mbox series

[RFC,0/6] change legacy linuxapp/bsdapp names

Message ID 20190306162242.65375-1-bruce.richardson@intel.com (mailing list archive)
Headers
Series change legacy linuxapp/bsdapp names |

Message

Bruce Richardson March 6, 2019, 4:22 p.m. UTC
  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/linuxapp
  

Comments

Thomas Monjalon March 9, 2019, 12:57 a.m. UTC | #1
06/03/2019 17:22, Bruce Richardson:
> 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

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 March 12, 2019, 10:13 p.m. UTC | #2
> 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
  
Ferruh Yigit March 13, 2019, 1:41 p.m. UTC | #3
On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
>> 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

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!
  
Thomas Monjalon March 13, 2019, 1:59 p.m. UTC | #4
13/03/2019 14:41, Ferruh Yigit:
> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
> >> 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
> 
> 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!
  
Ferruh Yigit March 13, 2019, 2:21 p.m. UTC | #5
On 3/13/2019 1:59 PM, Thomas Monjalon wrote:
> 13/03/2019 14:41, Ferruh Yigit:
>> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
>>>> 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
>>
>> 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!
> 

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 ...
  
Bruce Richardson March 13, 2019, 2:43 p.m. UTC | #6
On Wed, Mar 13, 2019 at 02:21:31PM +0000, Ferruh Yigit wrote:
> On 3/13/2019 1:59 PM, Thomas Monjalon wrote:
> > 13/03/2019 14:41, Ferruh Yigit:
> >> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
> >>>> 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
> >>
> >> 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!
> > 
> 
> 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
  
Bruce Richardson March 13, 2019, 3:02 p.m. UTC | #7
On Wed, Mar 13, 2019 at 02:21:31PM +0000, Ferruh Yigit wrote:
> On 3/13/2019 1:59 PM, Thomas Monjalon wrote:
> > 13/03/2019 14:41, Ferruh Yigit:
> >> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
> >>>> 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
> >>
> >> 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!
> > 
> 
> 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
  
Bruce Richardson March 13, 2019, 3:11 p.m. UTC | #8
On Wed, Mar 13, 2019 at 03:02:57PM +0000, Bruce Richardson wrote:
> On Wed, Mar 13, 2019 at 02:21:31PM +0000, Ferruh Yigit wrote:
> > On 3/13/2019 1:59 PM, Thomas Monjalon wrote:
> > > 13/03/2019 14:41, Ferruh Yigit:
> > >> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
> > >>>> 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
> > >>
> > >> 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!
> > > 
> > 
> > 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.
> 
http://patches.dpdk.org/patch/51155/

Please review.
Thanks,
/Bruce
  
Ferruh Yigit March 13, 2019, 3:14 p.m. UTC | #9
On 3/13/2019 2:43 PM, Bruce Richardson wrote:
> On Wed, Mar 13, 2019 at 02:21:31PM +0000, Ferruh Yigit wrote:
>> On 3/13/2019 1:59 PM, Thomas Monjalon wrote:
>>> 13/03/2019 14:41, Ferruh Yigit:
>>>> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
>>>>>> 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
>>>>
>>>> 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!
>>>
>>
>> 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.

Are we allowed to use symlinks J Will they play nice on windows?
  
Bruce Richardson March 13, 2019, 3:20 p.m. UTC | #10
On Wed, Mar 13, 2019 at 03:14:27PM +0000, Ferruh Yigit wrote:
> On 3/13/2019 2:43 PM, Bruce Richardson wrote:
> > On Wed, Mar 13, 2019 at 02:21:31PM +0000, Ferruh Yigit wrote:
> >> On 3/13/2019 1:59 PM, Thomas Monjalon wrote:
> >>> 13/03/2019 14:41, Ferruh Yigit:
> >>>> On 3/12/2019 10:13 PM, Thomas Monjalon wrote:
> >>>>>> 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
> >>>>
> >>>> 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!
> >>>
> >>
> >> 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.
> 
> 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.