From 98177ae9f931901646403485aadbed6f6813cad0 Mon Sep 17 00:00:00 2001 From: "Sridhar K. N. Rao" Date: Sat, 1 Oct 2022 19:03:06 +0530 Subject: DPDK: Default to Meson-Build of DPDK. This patch makes meson based build as default. Signed-off-by: Sridhar K. N. Rao Change-Id: Ie41748342a76cf157a1afcb2e1866d8f9e01c6f2 --- src/ovs/Makefile | 19 +++++-- src/ovs/Makefile.legacy | 123 ++++++++++++++++++++++++++++++++++++++++ src/ovs/Makefile.ovs_dpdk_meson | 123 ---------------------------------------- 3 files changed, 136 insertions(+), 129 deletions(-) create mode 100644 src/ovs/Makefile.legacy delete mode 100644 src/ovs/Makefile.ovs_dpdk_meson (limited to 'src/ovs') diff --git a/src/ovs/Makefile b/src/ovs/Makefile index e3adc2f8..2c0c0076 100644 --- a/src/ovs/Makefile +++ b/src/ovs/Makefile @@ -1,7 +1,7 @@ # makefile to manage ovs package # -# Copyright 2015 OPNFV +# 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. @@ -18,6 +18,7 @@ # # Contributors: # Aihua Li, Huawei Technologies. +# Sridhar Rao, The Linux Foundation include ../mk/master.mk include ../package-list.mk @@ -48,10 +49,16 @@ ifeq ($(DPDK_DIR),) DPDK_DIR = ../../dpdk/dpdk endif -ifeq ($(DPDK_TARGET),) -DPDK_TARGET = x86_64-native-linuxapp-gcc -endif -CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET) +DPDK_LIB = $(DPDK_DIR)/build/lib/x86_64-linux-gnu +LD_CONFIG_PATH := $(DPDK_LIB)/:$(LD_CONFIG_PATH) +PKG_CONFIG_PATH := $(DPDK_LIB)/pkgconfig/:$(PKG_CONFIG_PATH) + +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 @@ -65,7 +72,7 @@ all: force_make @echo "Finished making $(WORK_DIR) " config $(WORK_DIR)/Makefile: $(WORK_DIR)/configure - $(AT)cd $(WORK_DIR); $(CONFIG_CMD) + $(AT)cd $(WORK_DIR); LD_LIBRARY_PATH=$(DPDK_LIB) PKG_CONFIG_PATH=$(DPDK_LIB)/pkgconfig/ $(CONFIG_CMD) @echo "Configure done" INSTALL_TARGET = force_install force_make diff --git a/src/ovs/Makefile.legacy b/src/ovs/Makefile.legacy new file mode 100644 index 00000000..e3adc2f8 --- /dev/null +++ b/src/ovs/Makefile.legacy @@ -0,0 +1,123 @@ +# makefile to manage ovs package +# + +# Copyright 2015 OPNFV +# +# 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. + +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 +DPDK_DIR ?= $(shell echo $$DPDK_DIR) +ifeq ($(DPDK_DIR),) +DPDK_DIR = ../../dpdk/dpdk +endif + +ifeq ($(DPDK_TARGET),) +DPDK_TARGET = x86_64-native-linuxapp-gcc +endif +CONFIG_CMD += --with-dpdk=$(DPDK_DIR)/$(DPDK_TARGET) +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); $(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/ovs/Makefile.ovs_dpdk_meson b/src/ovs/Makefile.ovs_dpdk_meson deleted file mode 100644 index 4b4d997d..00000000 --- a/src/ovs/Makefile.ovs_dpdk_meson +++ /dev/null @@ -1,123 +0,0 @@ -# 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 $@ -- cgit 1.2.3-korg