summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshizhendong <[email protected]>2024-05-17 16:24:50 +0800
committershizhendong <[email protected]>2024-05-17 16:24:50 +0800
commitefe8ce82ebd468ecaa687ffd4148e7e0e5b99111 (patch)
tree2d1ac83e830b2bd5e54a5ab1174c10e542be8b61
parent6a7b98dbb07cd5cb62af5a130242ddece189473e (diff)
build: fpm 打包时添加依赖项nz_ipmi_exporter-24.01.03
-rw-r--r--tools/afterinstall.sh2
-rw-r--r--tools/package.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/afterinstall.sh b/tools/afterinstall.sh
index c611919..ae45997 100644
--- a/tools/afterinstall.sh
+++ b/tools/afterinstall.sh
@@ -93,7 +93,7 @@ if [ 1 -eq $1 ];then
! command -v ipmi-sel &> /dev/null; then
echo 'freeipmi not found, start install'
- rpm -ivh /opt/nezha/ipmi_exporter/deps/freeipmi-1.5.7-3.el7.x86_64.rpm
+ flock /var/lib/rpm/.rpm.lock rpm -ivh /opt/nezha/ipmi_exporter/deps/freeipmi-1.5.7-3.el7.x86_64.rpm
echo 'freeipmi install completed'
else
echo 'freeipmi already exists'
diff --git a/tools/package.sh b/tools/package.sh
index 310346b..74c68c6 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -36,7 +36,7 @@ cp ./tools/ipmi_local.yml $RPM_NZ_IPMI_EXPORTER_PATH
# 依赖资源
cp freeipmi-1.5.7-3.el7.x86_64.rpm $RPM_NZ_IPMI_EXPORTER_PATH/deps
-fpm -s dir -t rpm -d 'freeipmi >= 1.5.7' -n ${PACKAGE_NAME} -v ${PACKAGE_VERSION} --iteration ${ITERATION} --rpm-os 'linux' \
+fpm -s dir -t rpm -n ${PACKAGE_NAME} -v ${PACKAGE_VERSION} --iteration ${ITERATION} --rpm-os 'linux' \
--pre-install ./tools/beforeinstall.sh \
--post-install ./tools/afterinstall.sh \
--post-uninstall ./tools/afterremove.sh \