Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mdadm for openSUSE:Factory checked in at 2022-12-03 10:03:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mdadm (Old) and /work/SRC/openSUSE:Factory/.mdadm.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mdadm" Sat Dec 3 10:03:12 2022 rev:137 rq:1039445 version:4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/mdadm/mdadm.changes 2022-11-10 14:20:30.729747817 +0100 +++ /work/SRC/openSUSE:Factory/.mdadm.new.1835/mdadm.changes 2022-12-03 10:03:13.587103577 +0100 @@ -1,0 +2,15 @@ +Thu Nov 24 06:23:28 UTC 2022 - Coly Li <[email protected]> + +- Call mdadm_env.sh from /usr/libexec/mdadm (bsc#1111960, bsc#1202090) + 1004-call-mdadm_env.sh-from-usr-libexec-mdadm.patch +- The patch (bsc#1111960) which fixed rpm check failure is replaced + by the above patch, + 1004-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch. + +------------------------------------------------------------------- +Thu Nov 24 05:57:50 UTC 2022 - Coly Li <[email protected]> + +- mdadm.spec: remove "PreReq: %{_sbindir}/mkinitrd" as it is + unnecessary now. (bsc#1202352) + +------------------------------------------------------------------- Old: ---- 1004-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch New: ---- 1004-call-mdadm_env.sh-from-usr-libexec-mdadm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mdadm.spec ++++++ --- /var/tmp/diff_new_pack.YIC3Ht/_old 2022-12-03 10:03:15.763115669 +0100 +++ /var/tmp/diff_new_pack.YIC3Ht/_new 2022-12-03 10:03:15.767115691 +0100 @@ -32,7 +32,6 @@ BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(udev) PreReq: %fillup_prereq -PreReq: %{_sbindir}/mkinitrd PreReq: coreutils Recommends: smtp_daemon URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ @@ -97,7 +96,7 @@ Patch1001: 1001-display-timeout-status.patch Patch1002: 1002-OnCalendar-format-fix-of-mdcheck_start-timer.patch Patch1003: 1003-mdadm-treat-the-Dell-softraid-array-as-local-array.patch -Patch1004: 1004-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch +Patch1004: 1004-call-mdadm_env.sh-from-usr-libexec-mdadm.patch Patch1005: 1005-mdadm-enable-Intel-Alderlake-RSTe-configuration.patch %define _udevdir %(pkg-config --variable=udevdir udev) %define _systemdshutdowndir %{_unitdir}/../system-shutdown @@ -231,7 +230,8 @@ %{_unitdir}/mdcheck_start.timer %{_unitdir}/mdmonitor-oneshot.service %{_unitdir}/mdmonitor-oneshot.timer -%dir %{_prefix}/lib/mdadm -%{_prefix}/lib/mdadm/mdadm_env.sh +%dir %{_prefix}/libexec/ +%dir %{_prefix}/libexec/mdadm +%{_prefix}/libexec/mdadm/mdadm_env.sh %changelog ++++++ 1004-call-mdadm_env.sh-from-usr-libexec-mdadm.patch ++++++ >From 6e79d4bd229e5db4e435917daf4c57cd79db9265 Mon Sep 17 00:00:00 2001 From: colyli <[email protected]> Date: Wed, 17 Oct 2018 11:08:39 +0800 Subject: [PATCH] Call mdadm_env.sh from /usr/libexec/mdadm Patch-mainline: N/A, SUSE only patch References: bsc#1111960, bsc#1202090 Current Makefile installs mdadm_env.sh to /usr/libexec/mdadm but the systemd service files call it from /usr/lib/mdadm. This patch changes the calling path in systemd service files to /usr/libexec/mdadm to make things working. Signed-off-by: Coly Li <[email protected]> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: mdadm-4.2/systemd/mdcheck_continue.service =================================================================== --- mdadm-4.2.orig/systemd/mdcheck_continue.service +++ mdadm-4.2/systemd/mdcheck_continue.service @@ -14,5 +14,5 @@ Documentation=man:mdadm(8) Type=oneshot Environment="MDADM_CHECK_DURATION=6 hours" EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh ExecStart=/usr/share/mdadm/mdcheck --continue --duration ${MDADM_CHECK_DURATION} Index: mdadm-4.2/systemd/mdcheck_start.service =================================================================== --- mdadm-4.2.orig/systemd/mdcheck_start.service +++ mdadm-4.2/systemd/mdcheck_start.service @@ -14,5 +14,5 @@ Documentation=man:mdadm(8) Type=oneshot Environment="MDADM_CHECK_DURATION=6 hours" EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh ExecStart=/usr/share/mdadm/mdcheck --duration ${MDADM_CHECK_DURATION} Index: mdadm-4.2/systemd/mdmonitor-oneshot.service =================================================================== --- mdadm-4.2.orig/systemd/mdmonitor-oneshot.service +++ mdadm-4.2/systemd/mdmonitor-oneshot.service @@ -12,5 +12,5 @@ Documentation=man:mdadm(8) [Service] Environment=MDADM_MONITOR_ARGS=--scan EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh ExecStart=BINDIR/mdadm --monitor --oneshot $MDADM_MONITOR_ARGS Index: mdadm-4.2/systemd/mdmonitor.service =================================================================== --- mdadm-4.2.orig/systemd/mdmonitor.service +++ mdadm-4.2/systemd/mdmonitor.service @@ -13,5 +13,5 @@ Documentation=man:mdadm(8) [Service] Environment= MDADM_MONITOR_ARGS=--scan EnvironmentFile=-/run/sysconfig/mdadm -ExecStartPre=-/usr/lib/mdadm/mdadm_env.sh +ExecStartPre=-/usr/libexec/mdadm/mdadm_env.sh ExecStart=BINDIR/mdadm --monitor $MDADM_MONITOR_ARGS
