From 776c3cdb1435a76ae4b8fbc55c206c752b7117fe Mon Sep 17 00:00:00 2001 From: cx Date: Thu, 13 Nov 2025 17:38:52 +0800 Subject: [PATCH] fix: update rpm build and update doc. --- virtrust/docs/001-introduction.md | 2 +- virtrust/rpm/TSB-agent.spec | 2 +- virtrust/rpm/build_rpm.sh | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/virtrust/docs/001-introduction.md b/virtrust/docs/001-introduction.md index b204e8f..6a9a826 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 8b0d929..683dae1 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 fab7d63..d4021a1 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" -- Gitee