diff options
| -rwxr-xr-x | build/build.sh | 6 | ||||
| -rwxr-xr-x | build/build_dpdk_rpm.sh | 6 | ||||
| -rw-r--r-- | build/dpdk-snap/dpdk.spec | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/build/build.sh b/build/build.sh index 7262a7c..5714621 100755 --- a/build/build.sh +++ b/build/build.sh @@ -35,8 +35,12 @@ echo "Build DPDK SRPM for 17.02 release" ./build_dpdk_rpm.sh -g 17.02 -s yes -echo "Build from snapshot of master skipped for now because upstream commits" +echo "Build DPDK RPM from snapshot of master" +./build_dpdk_rpm.sh -g master + +echo "Build DPDK SRPM from snapshot of master" +./build_dpdk_rpm.sh -g master -s yes ./clean.sh exit 0 diff --git a/build/build_dpdk_rpm.sh b/build/build_dpdk_rpm.sh index 79d19de..e4e53d6 100755 --- a/build/build_dpdk_rpm.sh +++ b/build/build_dpdk_rpm.sh @@ -123,6 +123,7 @@ snapver=${snapser}.git${snapgit} if [[ "$DPDK_VERSION" =~ "master" ]]; then prefix=dpdk-${basever}.${snapser}.git${snapgit} + cp $HOME/dpdk-snap/dpdk.spec $TMPDIR/dpdk/dpdk.spec else prefix=dpdk-${basever:0:5} if [[ "$DPDK_PATCH" =~ "yes" && "$DPDK_VERSION" =~ "16.11" ]]; then @@ -149,8 +150,9 @@ if [[ ! "${SRC}dummy" == "dummy" ]]; then # breaking downstream builds when built from src rpm BUILD_OPT=(-bs --define "dist .el7") if [[ "$DPDK_VERSION" =~ "master" ]]; then - sed -i "s/%define ver.*/%define ver ${DPDK_VERSION}\ -%define snapver ${snapver}/" $TMPDIR/dpdk/dpdk.spec + sed -i "/%define ver.*/c\\ +%define ver ${basever}\\ +%define _snapver ${snapver}" $TMPDIR/dpdk/dpdk.spec else sed -i "s/%define ver.*/%define ver ${DPDK_VERSION}/" $TMPDIR/dpdk/dpdk.spec fi diff --git a/build/dpdk-snap/dpdk.spec b/build/dpdk-snap/dpdk.spec index 989c239..f6dbedd 100644 --- a/build/dpdk-snap/dpdk.spec +++ b/build/dpdk-snap/dpdk.spec @@ -14,7 +14,7 @@ Name: dpdk Version: %{ver} -Release: %{?_snapver:0.%{_snapver}.}%{rel}%{?dist} +Release: %{?_snapver:%{_snapver}.}%{rel}%{?dist} URL: http://dpdk.org Source: http://dpdk.org/browse/dpdk/snapshot/dpdk-%{srcver}.tar.gz |