mdadm/0001-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch
Neil Brown 1bd371d7b6 Accepting request 642513 from home:colyli:branches:openSUSE:Factory
- Update mdadm code base to mdadm-4.1 (bsc#1111960)
- All backport patches are deleted since they are in mdadm-4.1
  already.
- Fix Makefile to install mdadm_env.sh to /usr/lib/mdadm/
  (bsc#1111960)
  0001-Makefile-install-mdadm_env.sh-to-usr-lib-mdadm.patch

- Add missing patches which exist in SLE12-SP3 and should be in
  SLE15 too,
  - mdadm: improve the dlm locking mechanism for clustered raid
    (bsc#1049126)
    0218-mdadm-improve-the-dlm-locking-mechanism-for-clustere.patch
  - Assemble: provide protection when clustered raid do assemble
    (bsc#1049126)
    0219-Assemble-provide-protection-when-clustered-raid-do-a.patch
  - Assemble: cleanup the failure path
    (bsc#1049126)
    0220-Assemble-cleanup-the-failure-path.patch
  - Assemble: remove the protection when clustered raid do assemble
    (bsc#1101348)
    0221-Assemble-remove-the-protection-when-clustered-raid-d.patch
  - 1001-display-timeout-status.patch 

- mdadm.spec
  Change %doc to %license for COPYING file, which was warned during
  'osc ci'. 

- imsm: change reserved space to 4MB
  (bsc#1101110)
  0212-imsm-change-reserved-space-to-4MB.patch

OBS-URL: https://build.opensuse.org/request/show/642513
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=166
2018-10-17 05:01:26 +00:00

31 lines
943 B
Diff

From 6e79d4bd229e5db4e435917daf4c57cd79db9265 Mon Sep 17 00:00:00 2001
From: colyli <colyli@suse.coly>
Date: Wed, 17 Oct 2018 11:08:39 +0800
Subject: [PATCH] Makefile: install mdadm_env.sh to /usr/lib/mdadm
Current Makefile installs mdadm_env.sh to /usr/libexec/mdadm but calls it
from /usr/lib/mdadm. This patch changes the installation directory to
/usr/lib/mdadm to make things working.
Signed-off-by: Coly Li <colyli@suse.de>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 2767ac6..c0aaece 100644
--- a/Makefile
+++ b/Makefile
@@ -89,7 +89,7 @@ MDMON_DIR = $(RUN_DIR)
# place for autoreplace cookies
FAILED_SLOTS_DIR = $(RUN_DIR)/failed-slots
SYSTEMD_DIR=/lib/systemd/system
-LIB_DIR=/usr/libexec/mdadm
+LIB_DIR=/usr/lib/mdadm
COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC)
DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM)
--
2.19.0