From 2ce7f9834ab55728520bff0dd15f8d82c10b95a0 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 9 Jan 2017 20:24:50 +0100 Subject: Add dpdk development packaging Change-Id: I6aa2a6709241d99ce734c29e47487eb456907351 Signed-off-by: Damjan Marion --- build-data/packages/dpdk.mk | 6 +++--- build-data/packages/vpp.mk | 3 ++- build-data/platforms.mk | 4 ---- 3 files changed, 5 insertions(+), 8 deletions(-) (limited to 'build-data') diff --git a/build-data/packages/dpdk.mk b/build-data/packages/dpdk.mk index 2dcf4093..6c136824 100644 --- a/build-data/packages/dpdk.mk +++ b/build-data/packages/dpdk.mk @@ -42,8 +42,8 @@ ifneq ($(DPDK_MAKE_EXTRA_ARGS),) DPDK_MAKE_ARGS += DPDK_MAKE_EXTRA_ARGS="$(DPDK_MAKE_EXTRA_ARGS)" endif -dpdk_configure = echo +dpdk_configure = echo -dpdk_make_args = $(DPDK_MAKE_ARGS) config +dpdk_make_args = $(DPDK_MAKE_ARGS) ebuild-build -dpdk_install = make $(DPDK_MAKE_ARGS) build +dpdk_install = make $(DPDK_MAKE_ARGS) ebuild-install diff --git a/build-data/packages/vpp.mk b/build-data/packages/vpp.mk index fe68cd82..81aeab69 100644 --- a/build-data/packages/vpp.mk +++ b/build-data/packages/vpp.mk @@ -19,8 +19,9 @@ vpp_CPPFLAGS += -I$($(PLATFORM)_dpdk_inc_dir) vpp_LDFLAGS += -L$($(PLATFORM)_dpdk_lib_dir) else vpp_configure_depend += dpdk-install -vpp_CPPFLAGS += $(call installed_includes_fn, dpdk) +vpp_CPPFLAGS += $(call installed_includes_fn, dpdk)/dpdk vpp_LDFLAGS += $(call installed_libs_fn, dpdk) +vpp_CPPFLAGS += -I/usr/include/dpdk endif ifeq ($($(PLATFORM)_uses_dpdk_cryptodev),yes) vpp_configure_args += --with-dpdk-crypto diff --git a/build-data/platforms.mk b/build-data/platforms.mk index 41836750..2351898e 100644 --- a/build-data/platforms.mk +++ b/build-data/platforms.mk @@ -63,10 +63,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) ./scripts/find-vpp-api-python-contents $(INSTALL_PREFIX)$(ARCH) \ deb/debian/vpp-api-python.install ; \ \ - : dpdk headers ; \ - ./scripts/find-dpdk-contents $(INSTALL_PREFIX)$(ARCH) \ - deb/debian/vpp-dpdk-dev.install ; \ - \ : bin package needs startup config ; \ echo ../../src/vpp/conf/startup.conf /etc/vpp \ >> deb/debian/vpp.install ; \ -- cgit 1.2.3-korg