Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,5 @@ CONFIG.local
.settings
mk/cc.mk
mk/config.mk
mk/cc.flags.mk
PYTHON_COMMAND
9 changes: 9 additions & 0 deletions Makefile.container
Original file line number Diff line number Diff line change
@@ -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)
15 changes: 9 additions & 6 deletions Makefile.lb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
9 changes: 9 additions & 0 deletions lbv2.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
spdk:
spdk-sdk:
build:
- make -f Makefile.container all
install:
- make -f Makefile.container install
deps:
- dpdk:dpdk-sdk
- file://.