From c5a8bb3e1e94032849925c2d624ee9ab0344b299 Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Fri, 13 Aug 2021 21:05:59 +0800 Subject: [PATCH] Fix gating test error and rpminspect error Resolves: rhbz#1870487, rhbz#1880529 Signed-off-by: Xiao Ni --- mdadm.spec | 8 ++++++-- tests/md_trim_support/include.sh | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index 000a19e..abd37d0 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,7 +1,7 @@ Name: mdadm Version: 4.2 %define subversion rc2 -Release: rc2_1%{?dist}.1 +Release: rc2_1%{?dist}.2 Summary: The mdadm program controls Linux md devices (software RAID arrays) URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -83,13 +83,17 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d %{_sbindir}/* %{_unitdir}/* %{_mandir}/man*/md* -/usr/lib/systemd/system-shutdown/* +%{_prefix}/lib/systemd/system-shutdown/* %config(noreplace) %{_sysconfdir}/sysconfig/* %dir /run/%{name}/ %config(noreplace) %{_tmpfilesdir}/%{name}.conf /etc/libreport/events.d/* %changelog +* Fri Aug 13 2021 Xiao Ni - 4.2-rc2_1.2 +- Fix gating test error and rpminspect error +- Resolves rhbz#1870487, rhbz#1880529 + * Mon Aug 09 2021 Mohan Boddu - 4.2-rc2_1.1 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 diff --git a/tests/md_trim_support/include.sh b/tests/md_trim_support/include.sh index 2c56910..6b9ec3c 100755 --- a/tests/md_trim_support/include.sh +++ b/tests/md_trim_support/include.sh @@ -568,7 +568,7 @@ function Create_Loop_Devices (){ local size_mib="$2" local loop_dev_list='' for X in `seq 1 ${count}`;do - local loop_file_name=$(mktemp /tmp/loop.XXXXXX) + local loop_file_name=$(mktemp /root/loop.XXXXXX) dd if=/dev/zero of=${loop_file_name} count=$size_mib bs=1M 1>/dev/null 2>&1 local loop_dev_name=$(losetup -f) #BUG: RHEL5 only support 8 loop device and we need to check whether we are run out of it @@ -623,7 +623,7 @@ function remove_disks() { ((try_num++)) done done - rm -rf /tmp/loop.* + rm -rf /root/loop.* }