[Update] Support Newer versions of DPDK and OVS.

This patch adds support for DPDK and OVS.
The support is not default and user has to modify the Makefiles manually

Changes post-review by Al.

Signed-off-by: Sridhar K. N. Rao <srao@linuxfoundation.org>
Change-Id: I5d6d2c6d693d31f0930b469de849722e2d5ec418

14 files changed, 262 insertions, 0 deletions

diff --git a/src/dpdk/Makefile.dpdk_meson b/src/dpdk/Makefile.dpdk_meson
new file mode 100755
index 00000000..d0dd9e1a
--- /dev/null
+++ b/src/dpdk/Makefile.dpdk_meson
@@ -0,0 +1,74 @@
+# makefile to manage dpdk package
+#
+
+# Copyright 2022 Anuket
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Contributors:
+#   Aihua Li, Huawei Technologies.
+#   Martin Klozik, Intel Corporation.
+#   Christian Trautman, Red Hat Inc.
+#   Sridhar Rao, The Linux Foundation.
+
+include ../mk/master.mk
+include ../package-list.mk
+include /etc/os-release
+
+.PHONY: install force_make
+
+ifndef VHOST_USER
+    VHOST_USER = n
+endif
+WORK_DIR = dpdk
+TAG_DONE_FLAG = $(WORK_DIR)/.$(DPDK_TAG).tag.done
+
+all: force_make
+	@echo "Finished making $(WORK_DIR) "
+
+INSTALL_TARGET = force_make
+
+force_make: $(TAG_DONE_FLAG)
+	$(AT)cd $(WORK_DIR) && git pull $(DPDK_URL) $(DPDK_TAG)
+	$(AT)cd $(WORK_DIR) && meson build
+	$(AT)cd $(WORK_DIR) && cd build && meson configure -Denable_kmods=true && ninja
+	@echo "Make done"
+
+install: $(INSTALL_TARGET)
+	$(AT)sudo cp -a $(WORK_DIR)/$(DPDK_TARGET)/kmod $(INSTALL_DIR)/lib/modules/$(KERNEL_VERSION)
+	@echo "install done"
+
+# hard way to clean and clobber
+clean:
+	$(AT)cd $(WORK_DIR) && git clean -xfd *.o
+clobber:
+	$(AT)rm -rf $(WORK_DIR)
+
+# distclean is for developer who would like to keep the
+# clone git repo, saving time to fetch again from url
+distclean:
+	$(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f
+
+test:
+	@echo "Make test in $(WORK_DIR) (stub) "
+
+sanity:
+	@echo "Make sanity in $(WORK_DIR) (stub) "
+
+$(WORK_DIR):
+	$(AT)git clone $(DPDK_URL) dpdk
+
+$(TAG_DONE_FLAG): $(WORK_DIR)
+	$(AT)cd $(WORK_DIR); git checkout $(DPDK_TAG)
+	$(AT)touch $@
diff --git a/src/ovs/Makefile.ovs_dpdk_meson b/src/ovs/Makefile.ovs_dpdk_meson
new file mode 100644
index 00000000..4b4d997d
--- /dev/null
+++ b/src/ovs/Makefile.ovs_dpdk_meson
@@ -0,0 +1,123 @@
+# makefile to manage ovs package
+#
+
+# Copyright 2022 Anuket
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#
+# Contributors:
+#   Aihua Li, Huawei Technologies.
+#   Sridhar Rao, The Linux Foundation
+
+include ../mk/master.mk
+include ../package-list.mk
+
+WORK_DIR = ovs
+TAG_DONE_FLAG = $(WORK_DIR)/.$(OVS_TAG).done
+CONFIG_CMD =
+CONFIG_CMD += ./configure
+OVS_VANILLA = ../../src_vanilla/ovs
+
+# If WITH_LINUX is defined, OVS is built without DPDK but with kernel
+# module
+# By default, OVS is built with DPDK
+
+# WITH_LINUX is the Linux kernel build directory used for building
+# OVS kernel module as documented in OVS --with-linux switch
+ifneq ($(WITH_LINUX),) # Building with Linux kernel
+CONFIG_CMD += --with-linux=$(WITH_LINUX)
+
+else # Building with DPDK
+
+# DPDK_DIR is the top directory for dpdk source tree
+# it can be passed in from Makefile command
+# if it is not set, try to read it in from environment
+# if it is still not set, then set it using relative path
+PKG_CONFIG_PATH := ../dpdk/dpdk/build/meson-private
+LD_CONFIG_PATH := ../dpdk/dpdk/build/lib
+export LD_CONFIG_PATH
+export PKG_CONFIG_PATH
+
+# echo $$ENV{LD_CONFIG_PATH}
+
+CONFIG_CMD += --with-dpdk=shared
+CONFIG_CMD += CFLAGS="-g -O2 -Wno-cast-align"
+
+endif # Kernel vs. DPDK
+
+.PHONY: install force_install config force_make
+
+# install depends on make
+force_install: force_make
+
+all: force_make
+	@echo "Finished making $(WORK_DIR) "
+
+config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure
+	$(AT)cd $(WORK_DIR); LD_CONFIG_PATH=../../dpdk/dpdk/build/lib PKG_CONFIG_PATH=../../dpdk/dpdk/build/meson-private $(CONFIG_CMD)
+	@echo "Configure done"
+
+INSTALL_TARGET = force_install force_make
+
+force_make: $(WORK_DIR)/Makefile
+	$(AT)cd $(WORK_DIR) && git pull $(OVS_URL) $(OVS_TAG)
+	@echo "git pull done"
+	$(AT)echo "WITH_LINUX = $(WITH_LINUX)"
+	$(AT)$(MAKE) -C $(WORK_DIR) $(MORE_MAKE_FLAGS)
+	@echo "Make done"
+
+force_install:
+	$(AT)sudo make -C $(WORK_DIR) modules_install
+	$(AT)sudo $(MAKE) -C $(WORK_DIR) install
+
+install: $(INSTALL_TARGET)
+
+# hard way to clean and clobber
+clean:
+	$(AT)cd $(WORK_DIR) && git clean -xfd *.o
+clobber:
+	$(AT)rm -rf $(WORK_DIR)
+	$(AT)rm -rf $(OVS_VANILLA)
+
+# distclean is for developer who would like to keep the
+# clone git repo, saving time to fetch again from url
+distclean:
+	$(AT)cd $(WORK_DIR) && git clean -xfd && git checkout -f
+
+test:
+	@echo "Make test in $(WORK_DIR) (stub) "
+
+sanity:
+	@echo "Make sanity in $(WORK_DIR) (stub) "
+
+.PHONY: boot
+# boot ovs is the process to produce the script 'configure'
+boot $(WORK_DIR)/configure:
+	@echo "booting up ovs"
+	$(AT)cd $(WORK_DIR); ./boot.sh
+	@echo "done booting ovs"
+
+boot $(WORK_DIR)/configure: $(TAG_DONE_FLAG)
+
+$(WORK_DIR):
+	$(AT)git clone $(OVS_URL) ovs
+	$(AT)mkdir -p $(OVS_VANILLA)
+	$(AT)cp -rf ./* $(OVS_VANILLA)
+
+$(TAG_DONE_FLAG): $(WORK_DIR)
+	$(AT)cd ovs; git checkout $(OVS_TAG)
+ifneq ($(PATCH_FILE),)
+	$(AT)cd $(WORK_DIR); patch -p1 < ../$(PATCH_FILE)
+endif
+	$(AT)touch $@
diff --git a/src/package-list.mk.dpdk_meson b/src/package-list.mk.dpdk_meson
new file mode 100644
index 00000000..3c219e53
--- /dev/null
+++ b/src/package-list.mk.dpdk_meson
@@ -0,0 +1,32 @@
+# Copyright (c) 2016-2017 Intel corporation.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Upstream Package List
+#
+# Everything here is defined as its suggested default
+# value, it can always be overriden when invoking Make
+
+# dpdk section
+# DPDK_URL ?= git://dpdk.org/dpdk
+DPDK_URL ?= http://dpdk.org/git/dpdk
+DPDK_TAG ?= v22.03
+
+# OVS section
+OVS_URL ?= https://github.com/openvswitch/ovs
+OVS_TAG ?= v2.17.0
+
+# VPP section
+VPP_URL ?= https://git.fd.io/vpp
+VPP_TAG ?= v21.01
+
+# QEMU section
+QEMU_URL ?= https://github.com/qemu/qemu.git
+QEMU_TAG ?= v3.1.1
+
+# TREX section
+TREX_URL ?= https://github.com/cisco-system-traffic-generator/trex-core.git
+TREX_TAG ?= v2.86
diff --git a/systems/centos/build_base_machine.sh b/systems/centos/build_base_machine.sh
index fdaa37b5..31b26e87 100755
--- a/systems/centos/build_base_machine.sh
+++ b/systems/centos/build_base_machine.sh
@@ -47,6 +47,8 @@ pciutils
 cifs-utils
 sysstat
 sshpass
+meson
+ninja-build
 
 # libs
 libpcap-devel
@@ -79,6 +81,7 @@ yum -y install $(echo "
 rh-python36
 rh-python36-python-tkinter
 python3-setuptools
+python3-pyelftools
 git-review
 " | grep -v ^#)
 # prevent ovs vanilla from building from source due to kernel incompatibilities
diff --git a/systems/debian/build_base_machine.sh b/systems/debian/build_base_machine.sh
index cc3f1eb8..e41837a2 100755
--- a/systems/debian/build_base_machine.sh
+++ b/systems/debian/build_base_machine.sh
@@ -27,6 +27,9 @@ apt-get -y install curl
 apt-get -y install git
 apt-get -y install wget
 apt-get -y install python3-venv
+apt-get -y install python3-pyelftools
+apt-get -y install meson
+apt-get -y install ninja-build
 
 # Make and Compilers
 apt-get -y install make
diff --git a/systems/fedora/24/build_base_machine.sh b/systems/fedora/24/build_base_machine.sh
index bbde9b77..12bff64a 100644
--- a/systems/fedora/24/build_base_machine.sh
+++ b/systems/fedora/24/build_base_machine.sh
@@ -34,6 +34,8 @@ pixman-devel
 openssl-devel
 redhat-rpm-config
 elfutils-libelf-devel
+meson
+ninja-build
 
 # tools
 curl
@@ -63,6 +65,7 @@ python3-libs
 libreport-python3
 abrt-python3
 abrt-addon-python3
+python3-pyelftools
 
 # libs
 numactl
diff --git a/systems/fedora/25/build_base_machine.sh b/systems/fedora/25/build_base_machine.sh
index df8ae620..0ac53809 100644
--- a/systems/fedora/25/build_base_machine.sh
+++ b/systems/fedora/25/build_base_machine.sh
@@ -34,6 +34,8 @@ pixman-devel
 openssl-devel
 redhat-rpm-config
 elfutils-libelf-devel
+meson
+ninja-build
 
 # tools
 curl
@@ -63,6 +65,7 @@ python3-libs
 libreport-python3
 abrt-python3
 abrt-addon-python3
+python3-pyelftools
 
 # libs
 numactl
diff --git a/systems/fedora/26/build_base_machine.sh b/systems/fedora/26/build_base_machine.sh
index 84c0695b..323824b5 100644
--- a/systems/fedora/26/build_base_machine.sh
+++ b/systems/fedora/26/build_base_machine.sh
@@ -34,6 +34,8 @@ pixman-devel
 openssl-devel
 redhat-rpm-config
 elfutils-libelf-devel
+meson
+ninja-build
 
 # tools
 curl
@@ -63,6 +65,7 @@ python3-libs
 libreport-python3
 abrt-python3
 abrt-addon-python3
+python3-pyelftools
 
 # libs
 numactl
diff --git a/systems/fedora/33/build_base_machine.sh b/systems/fedora/33/build_base_machine.sh
index f521827e..f3a27644 100644
--- a/systems/fedora/33/build_base_machine.sh
+++ b/systems/fedora/33/build_base_machine.sh
@@ -34,6 +34,8 @@ pixman-devel
 openssl-devel
 redhat-rpm-config
 elfutils-libelf-devel
+meson
+ninja-build
 
 # tools
 curl
@@ -62,6 +64,7 @@ python3-libs
 python3-libreport
 python3-abrt
 python3-abrt-addon
+python3-pyelftools
 
 # libs
 numactl
diff --git a/systems/opensuse/build_base_machine.sh b/systems/opensuse/build_base_machine.sh
index 8b26440c..b7d4249a 100755
--- a/systems/opensuse/build_base_machine.sh
+++ b/systems/opensuse/build_base_machine.sh
@@ -50,6 +50,8 @@ sysstat
 java-1_8_0-openjdk
 git-review
 mlocate
+meson
+ninja-build
 
 # python
 python3
@@ -59,6 +61,7 @@ python3-setuptools
 python3-devel
 python3-tk
 python3-virtualenv
+python3-pyelftools
 
 # libraries
 libnuma1
diff --git a/systems/rhel/7.2/build_base_machine.sh b/systems/rhel/7.2/build_base_machine.sh
index c0f367ab..aefa5e5d 100755
--- a/systems/rhel/7.2/build_base_machine.sh
+++ b/systems/rhel/7.2/build_base_machine.sh
@@ -34,6 +34,8 @@ pkglist=(\
  openssl-devel\
  pixman-devel\
  sysstat\
+ meson\
+ ninja-build\
 )
 
 # Tools
@@ -60,6 +62,7 @@ pkglist=(
 pkglist=(
  "${pkglist[@]}"\
  python-six\
+ python3-pyelftools\
 )
 
 # install RHEL compatible epel for sshpass
diff --git a/systems/rhel/7.3/build_base_machine.sh b/systems/rhel/7.3/build_base_machine.sh
index 42c36e4c..55532781 100755
--- a/systems/rhel/7.3/build_base_machine.sh
+++ b/systems/rhel/7.3/build_base_machine.sh
@@ -34,6 +34,8 @@ pkglist=(\
  openssl-devel\
  pixman-devel\
  sysstat\
+ meson\
+ ninja-build\
 )
 
 # Tools
@@ -60,6 +62,7 @@ pkglist=(
 pkglist=(
  "${pkglist[@]}"\
  python-six\
+ python3-pyelftools\
 )
 
 # install RHEL compatible epel for sshpass
diff --git a/systems/rhel/7.5/build_base_machine.sh b/systems/rhel/7.5/build_base_machine.sh
index deb4e8a2..3dc04b15 100755
--- a/systems/rhel/7.5/build_base_machine.sh
+++ b/systems/rhel/7.5/build_base_machine.sh
@@ -34,6 +34,8 @@ pkglist=(\
  openssl-devel\
  pixman-devel\
  sysstat\
+ meson\
+ ninja-build\
 )
 
 # Tools
@@ -60,6 +62,7 @@ pkglist=(
 pkglist=(
  "${pkglist[@]}"\
  python-six\
+ python3-pyelftools\
 )
 
 # install RHEL compatible epel for sshpass
diff --git a/systems/ubuntu/build_base_machine.sh b/systems/ubuntu/build_base_machine.sh
index 2f3e7b25..910cd173 100755
--- a/systems/ubuntu/build_base_machine.sh
+++ b/systems/ubuntu/build_base_machine.sh
@@ -31,6 +31,9 @@ apt-get -y install libssl1.0.0
 apt-get -y install libxml2
 apt-get -y install zlib1g-dev
 apt-get -y install scapy
+apt-get -y install meson
+apt-get -y install ninja-build
+apt-get -y install python3-pyelftools
 
 # Linux Kernel Source
 apt-get -y install linux-source