Commit 3e26af2a authored by Paul Luse's avatar Paul Luse Committed by Jim Harris
Browse files

autopackage: add ipsec submodule to autopackage 



The way autopackage builds spdk, the absence of ipsec
in the tarball will result in missing dpdk crypto options
if crypto is enabled.  This patch adds the ipsec submodule
to the tarball.

Change-Id: Ia21f3e90c4753569cf2aa1887e4938740fd47113
Signed-off-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-on: https://review.gerrithub.io/424142


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 0fd41a7c

autopackage.sh

+10 −1
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ spdk_pv=spdk-$(date +%Y_%m_%d) 
spdk_tarball=${spdk_pv}.tar

dpdk_pv=dpdk-$(date +%Y_%m_%d)

dpdk_tarball=${dpdk_pv}.tar

ipsec_pv=ipsec-$(date +%Y_%m_%d)

ipsec_tarball=${ipsec_pv}.tar



find . -iname "spdk-*.tar* dpdk-*.tar*" -delete

find . -iname "spdk-*.tar* dpdk-*.tar* ipsec-*.tar*" -delete

git archive HEAD^{tree} --prefix=${spdk_pv}/ -o ${spdk_tarball}



# Build from packaged source
@@ -40,6 +42,13 @@ if [ -z "$WITH_DPDK_DIR" ]; then 
	tar -C "$tmpdir/${spdk_pv}" -xf $dpdk_tarball

fi



if [ -d "intel-ipsec-mb" ]; then

	cd intel-ipsec-mb

	git archive HEAD^{tree} --prefix=intel-ipsec-mb/ -o ../${ipsec_tarball}

	cd ..

	tar -C "$tmpdir/${spdk_pv}" -xf $ipsec_tarball

fi



(

	cd "$tmpdir"/spdk-*

	# use $config_params to get the right dependency options, but disable coverage and ubsan