aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryalei wang <wylandrea@gmail.com>2018-09-18 02:07:35 +0000
committerGerrit Code Review <gerrit@fd.io>2018-09-18 02:07:35 +0000
commit2827d26800e19858d4a9856c8a8f977a273f9910 (patch)
treec9df77c54591f7d8d538a8041eab04b8a432f334
parent8cf988fa20a721f0d67366ab94a58124b548a089 (diff)
parent40bea8c1be6873df52cb2c381be3049048985b0d (diff)
Merge "Fix: rpm build error"
-rw-r--r--pkg/rpm/dmm.spec2
-rwxr-xr-xscripts/compile_dmm.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/rpm/dmm.spec b/pkg/rpm/dmm.spec
index c9b8c75..79dfb05 100644
--- a/pkg/rpm/dmm.spec
+++ b/pkg/rpm/dmm.spec
@@ -38,7 +38,7 @@ install -c ../BUILD/%{name}-%{version}/release/bin/vs_select %{name}-%{version}-
install -c ../BUILD/%{name}-%{version}/release/bin/ks_common %{name}-%{version}-%{release}.x86_64/usr/bin
install -c ../BUILD/%{name}-%{version}/release/bin/vs_common %{name}-%{version}-%{release}.x86_64/usr/bin
-install -c ../BUILD/%{name}-%{version}/release/lib64/libdmm_api.a %{name}-%{version}-%{release}.x86_64/usr/lib64
+install -c ../BUILD/%{name}-%{version}/release/lib64/libdmm_api.so %{name}-%{version}-%{release}.x86_64/usr/lib64
install -c ../BUILD/%{name}-%{version}/release/lib64/libnStackAPI.so %{name}-%{version}-%{release}.x86_64/usr/lib64
%files
diff --git a/scripts/compile_dmm.sh b/scripts/compile_dmm.sh
index b4bc455..f9a6c78 100755
--- a/scripts/compile_dmm.sh
+++ b/scripts/compile_dmm.sh
@@ -21,9 +21,9 @@ else
fi
if [ "$OS_ID" == "centos" ]; then
- make pkg-rpm
+ make pkg-rpm || exit 1
elif [ "$OS_ID" == "ubuntu" ]; then
- make pkg-deb
+ make pkg-deb || exit 1
fi
echo "DMM build has FINISHED"