diff --git a/.gitignore b/.gitignore index bd83e94e50b..763d77fea92 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ CONFIG.local .settings mk/cc.mk mk/config.mk +mk/cc.flags.mk PYTHON_COMMAND diff --git a/Makefile.container b/Makefile.container new file mode 100644 index 00000000000..3377c859ca3 --- /dev/null +++ b/Makefile.container @@ -0,0 +1,9 @@ +include $(WORKSPACE_TOP)/lb_containers/Makefile.container + + +TARGETS := all build checkout_deps clean install checkin + +$(TARGETS): dpdk_container + ${Q}run_in_container -i lbdpdk:${LBDPDK_CONTAINER_VERSION} -- ${MAKE} -f Makefile.lb $@ + +.PHONY: $(TARGETS) diff --git a/Makefile.lb b/Makefile.lb index ce638646a25..81e6120d159 100644 --- a/Makefile.lb +++ b/Makefile.lb @@ -4,17 +4,20 @@ RTE_SDK:=$(shell component-tool localpath --repo=dpdk --type=$(BUILD_TYPE) dpdk- SPDK_INSTALL_DIR ?= $(shell component-tool localpath --repo=spdk --type=$(BUILD_TYPE) spdk-sdk) MACHINE_CFLAGS := "-march=broadwell" +DISABLE_WARNING := "-Wno-address-of-packed-member -Wno-misleading-indentation -Wno-vla-parameter \ + -Wno-zero-length-bounds -Wno-maybe-uninitialized -Wno-format-overflow -fcommon \ + -Wno-return-type -Wno-deprecated-declarations" all: build checkout_deps: $(Q)lb-build -d -build: checkout_deps - ./configure --with-dpdk=$(RTE_SDK) - $(Q)$(MAKE) MACHINE_CFLAGS=$(MACHINE_CFLAGS) CONFIG_DPDK_DIR=$(RTE_SDK) +build: checkout_deps + CFLAGS=$(DISABLE_WARNING) CXXFLAGS=$(CXXFLAGS) ./configure --with-dpdk=$(RTE_SDK) + $(Q)$(MAKE) MACHINE_CFLAGS=$(MACHINE_CFLAGS) CONFIG_DPDK_DIR=$(RTE_SDK) -j10 -clean: checkout_deps +clean: checkout_deps $(Q)$(MAKE) CONFIG_DPDK_DIR=$(RTE_SDK) clean install: |checkout_deps @@ -26,8 +29,8 @@ install: |checkout_deps $(Q) cp -a config* $(SPDK_INSTALL_DIR) $(Q) cp -a include $(SPDK_INSTALL_DIR) -checkin: +checkin: $(Q)component-tool checkin --repo=spdk --type=$(BUILD_TYPE) spdk-sdk -.PHONY: install checkin +.PHONY: install checkin diff --git a/lbv2.yaml b/lbv2.yaml new file mode 100644 index 00000000000..157a66cb6da --- /dev/null +++ b/lbv2.yaml @@ -0,0 +1,9 @@ +spdk: + spdk-sdk: + build: + - make -f Makefile.container all + install: + - make -f Makefile.container install + deps: + - dpdk:dpdk-sdk + - file://.