diff --git a/virtrust/docs/001-introduction.md b/virtrust/docs/001-introduction.md index b204e8ffdb98569c078993d07776b0ee4dbbc24a..6a9a82615a9abad21514fc6246268e5612ec8e1b 100644 --- a/virtrust/docs/001-introduction.md +++ b/virtrust/docs/001-introduction.md @@ -25,7 +25,7 @@ sudo dnf install gcc g++ cmake make # 开发库 sudo dnf install grpc grpc-devel grpc-plugins protobuf-devel protobuf-compiler -sudo dnf install libboundscheck-devel +sudo dnf install libboundscheck # 运行时依赖 sudo dnf install libxml2-devel libguestfs-devel openssl-devel libvirt-devel diff --git a/virtrust/rpm/TSB-agent.spec b/virtrust/rpm/TSB-agent.spec index 8b0d9298631dd32f3ee8ccc208b76e76d72e7841..683dae18f10e0e6b61e3bfc2a39231f833d76f33 100644 --- a/virtrust/rpm/TSB-agent.spec +++ b/virtrust/rpm/TSB-agent.spec @@ -64,7 +64,7 @@ tar -xzf %{SOURCE4} -C "$DEPS_SRC/spdlog" --strip-components=1 mkdir -p "$DEPS_SRC/libboundscheck-src" tar -xzf %{SOURCE5} -C "$DEPS_SRC/libboundscheck-src" --strip-components=1 -%global root_dir %{name}-%{version} +%global root_dir %{_builddir}/%{name}-%{version} %global build_dir %{_builddir}/%{name}-%{version}/build %global lib_out_dir %{build_dir}/lib64 %global bin_out_dir %{build_dir}/bin diff --git a/virtrust/rpm/build_rpm.sh b/virtrust/rpm/build_rpm.sh index fab7d63cd7635e763165cf6cfedbd412501b8578..d4021a17cad29ce6071453c976d395d769b9542a 100644 --- a/virtrust/rpm/build_rpm.sh +++ b/virtrust/rpm/build_rpm.sh @@ -111,7 +111,6 @@ echo "==> Preparing rpmbuild tree" RPMBUILD_ROOT="$HOME/rpmbuild" mkdir -p "$RPMBUILD_ROOT"/{SPECS,SRPMS,RPMS,BUILD,BUILDROOT} -# 可以直接用仓库里的 spec,不必复制,但有些人喜欢 copy 一份到 SPECS 里: cp -f "$SPEC_FILE" "$RPMBUILD_ROOT/SPECS/" echo "==> Running rpmbuild"