From e6358450214e9e776e660aaa6058224f12af6b60 Mon Sep 17 00:00:00 2001 From: Thomas F Herbert Date: Mon, 2 Jan 2017 17:33:08 -0500 Subject: Apply virtio driver patch to version 16.11 Change-Id: I628c0b890bfdfe74c79104316ce89d6bdbf61867 Signed-off-by: Thomas F Herbert --- build/build_dpdk_rpm.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'build/build_dpdk_rpm.sh') diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh index fa90248..73afc17 100755 --- a/build/build_dpdk_rpm.sh +++ b/build/build_dpdk_rpm.sh @@ -110,8 +110,6 @@ else git checkout v$DPDK_VERSION fi -cp $HOME/dpdk-snap/dpdk.spec $TMPDIR/dpdk -cp $HOME/dpdk-snap/dpdk.spec $RPMDIR/SPECS cp $HOME/dpdk-snap/* $RPMDIR/SOURCES snapser=`git log --pretty=oneline | wc -l` @@ -119,13 +117,28 @@ makever=`make showversion` basever=`echo ${makever} | cut -d- -f1` snapver=${snapser}.git${snapgit} + if [[ "$DPDK_VERSION" =~ "master" ]]; then prefix=dpdk-${basever}.${snapser}.git${snapgit} - archive=${prefix}.tar.gz + cp $HOME/dpdk-snap/dpdk.spec $TMPDIR/dpdk + cp $HOME/dpdk-snap/dpdk.spec $RPMDIR/SOURCES + cp $HOME/dpdk-snap/dpdk.spec $RPMDIR/SPECS else prefix=dpdk-${basever:0:5} - archive=${prefix}.tar.gz + if [[ "$DPDK_PATCH" =~ "yes" && "$DPDK_VERSION" =~ "16.11" ]]; then + echo "----------------------------------------------" + echo "Copy applicable patches." + cp $TOPDIR/patches/$DPDK_VERSION/* $RPMDIR/SOURCES + cp $HOME/dpdk-snap/dpdk.1611.spec $TMPDIR/dpdk/dpdk.spec + cp $HOME/dpdk-snap/dpdk.1611.spec $RPMDIR/SPECS/dpdk.spec + cp $HOME/dpdk-snap/dpdk.1611.spec $RPMDIR/SOURCES/dpdk.spec + else + cp $HOME/dpdk-snap/dpdk.spec $TMPDIR/dpdk + cp $HOME/dpdk-snap/dpdk.spec $RPMDIR/SOURCES + cp $HOME/dpdk-snap/dpdk.spec $RPMDIR/SPECS + fi fi +archive=${prefix}.tar.gz echo "-------------------------------" echo "Creating archive: ${archive}" -- cgit 1.2.3-korg