From 0fdec2f1574584da418c088fa0b72fb5313dbb2b Mon Sep 17 00:00:00 2001 From: overweight Date: Fri, 23 Feb 2024 11:46:28 +0800 Subject: [PATCH] build: change util-linux-devel to libblkid-devel --- ci/00-pre.sh | 6 +----- docs/cicd/build_rpm_with_mock/sysmaster.spec | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ci/00-pre.sh b/ci/00-pre.sh index cc40b307..c4761d77 100755 --- a/ci/00-pre.sh +++ b/ci/00-pre.sh @@ -5,11 +5,7 @@ source $SCRIPT_DIR/common_function contains_chinese # Install required tools if not already installed -if [ ! -f "/etc/centos-release" ] && [ ! -f "/etc/fedora-release" ]; then - required_packages=("gcc" "openssl-libs" "python3-pip" "python3" "python3-devel" "clang" "util-linux-devel" "kmod-devel") -else - required_packages=("gcc" "openssl-libs" "python3-pip" "python3" "python3-devel" "clang" "libblkid-devel" "kmod-devel" "libselinux-devel") -fi +required_packages=("gcc" "openssl-libs" "python3-pip" "python3" "python3-devel" "clang" "libblkid-devel" "kmod-devel" "libselinux-devel") missing_packages=() for package in "${required_packages[@]}"; do diff --git a/docs/cicd/build_rpm_with_mock/sysmaster.spec b/docs/cicd/build_rpm_with_mock/sysmaster.spec index 55099138..b451093f 100644 --- a/docs/cicd/build_rpm_with_mock/sysmaster.spec +++ b/docs/cicd/build_rpm_with_mock/sysmaster.spec @@ -32,7 +32,7 @@ Summary: %{summary} %package -n devmaster Summary: Infrastructure of device management in userspace. -BuildRequires: util-linux-devel kmod-devel +BuildRequires: libblkid-devel kmod-devel Requires: %{name}%{?_isa} = %{version}-%{release} Requires(post): sysmaster Requires(preun): sysmaster -- Gitee