Changes to allow RPM build with pre-built dpdk lib

supporting RPM changes to allow vrouter dpdk package built with
pre-built dpdk library (from upstream)

Change-Id: I2fc44fcdfba56e30ab5552dab5932f920571bdf9
Closes-Jira-Bug: TFB-1446

Makefile

@@ -25,6 +25,10 @@ RPMBUILD_FLAGS += --define "_srcVer $(SRCVER)"
 RPMBUILD_FLAGS += --define "_buildTag $(BUILDTAG)"
 DEPBUILD_FLAGS :=
 
+ifdef DPDK_BUILD_DIR
+	RPMBUILD_FLAGS += --define "_dpdk_build_dir $(DPDK_BUILD_DIR)"
+endif
+
 ifeq ($(ENABLEMLX),TRUE)
 	RPMBUILD_FLAGS += --define "_enableMellanox $(ENABLEMLX)"
 	DEPBUILD_FLAGS += --define "_enableMellanox $(ENABLEMLX)"

rpm/contrail-vrouter-dpdk/contrail-vrouter-dpdk.spec

@@ -33,6 +33,12 @@
 
 %define         _kernel_dir /lib/modules/%{_kVers}/build
 
+%if 0%{?_dpdk_build_dir:1}
+%define         _dpdk_args --dpdk-dir=%{_dpdk_build_dir}
+%else
+%define         _dpdk_args %{nil}
+%endif
+
 
 %bcond_without debuginfo
 
@@ -88,6 +94,7 @@ pushd %{_sbtop}
 RTE_KERNELDIR=%{_kernel_dir} scons -c \
     --opt=%{_sconsOpt} \
     --kernel-dir=%{_kernel_dir} \
+    %{_dpdk_args} \
     --root=%{_builddir} \
     --add-opts=%{_sconsAddOpts} \
     vrouter/dpdk
@@ -98,6 +105,7 @@ pushd %{_sbtop}
 RTE_KERNELDIR=%{_kernel_dir} scons \
     --opt=%{_sconsOpt} \
     --kernel-dir=%{_kernel_dir} \
+    %{_dpdk_args} \
     --root=%{_builddir} \
     --add-opts=%{_sconsAddOpts} \
     vrouter/dpdk