|
 |
b7f731 |
From b63804583e25fbc00b96c7f37f97d568b5b1ba9c Mon Sep 17 00:00:00 2001
|
|
|
b7f731 |
From: Coly Li <colyli@suse.de>
|
|
|
b7f731 |
Date: Sun, 16 Apr 2017 15:01:29 +0800
|
|
|
b7f731 |
Subject: [RHEL7.5 PATCH 086/169] mdadm: retire mdassemble in make
|
|
|
b7f731 |
everything
|
|
|
b7f731 |
|
|
|
b7f731 |
make everything reports no rule to make mdassemble, because mdassemble
|
|
|
b7f731 |
is removed from mdadm. This patch removes mdassemble from "everything"
|
|
|
b7f731 |
in Makefile, now there is no failure when compiling a static mdadm binary.
|
|
|
b7f731 |
|
|
|
b7f731 |
Signed-off-by: Coly Li <colyli@suse.de>
|
|
|
b7f731 |
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
|
b7f731 |
---
|
|
|
b7f731 |
Makefile | 11 ++---------
|
|
|
b7f731 |
1 file changed, 2 insertions(+), 9 deletions(-)
|
|
|
b7f731 |
|
|
|
b7f731 |
diff --git a/Makefile b/Makefile
|
|
|
b7f731 |
index a5d2a0a..5655812 100644
|
|
|
b7f731 |
--- a/Makefile
|
|
|
b7f731 |
+++ b/Makefile
|
|
|
b7f731 |
@@ -169,12 +169,10 @@ check_rundir:
|
|
|
b7f731 |
fi
|
|
|
b7f731 |
|
|
|
b7f731 |
everything: all mdadm.static swap_super test_stripe raid6check \
|
|
|
b7f731 |
- mdassemble mdassemble.auto mdassemble.static mdassemble.man \
|
|
|
b7f731 |
mdadm.Os mdadm.O2 man
|
|
|
b7f731 |
everything-test: all mdadm.static swap_super test_stripe \
|
|
|
b7f731 |
- mdassemble.auto mdassemble.static mdassemble.man \
|
|
|
b7f731 |
mdadm.Os mdadm.O2 man
|
|
|
b7f731 |
-# mdadm.uclibc and mdassemble.uclibc don't work on x86-64
|
|
|
b7f731 |
+# mdadm.uclibc doesn't work on x86-64
|
|
|
b7f731 |
# mdadm.tcc doesn't work..
|
|
|
b7f731 |
|
|
|
b7f731 |
mdadm : $(OBJS) | check_rundir
|
|
|
b7f731 |
@@ -226,9 +224,6 @@ md.man : md.4
|
|
|
b7f731 |
mdadm.conf.man : mdadm.conf.5
|
|
|
b7f731 |
man -l mdadm.conf.5 > mdadm.conf.man
|
|
|
b7f731 |
|
|
|
b7f731 |
-mdassemble.man : mdassemble.8
|
|
|
b7f731 |
- man -l mdassemble.8 > mdassemble.man
|
|
|
b7f731 |
-
|
|
|
b7f731 |
raid6check.man : raid6check.8
|
|
|
b7f731 |
man -l raid6check.8 > raid6check.man
|
|
|
b7f731 |
|
|
|
b7f731 |
@@ -293,9 +288,7 @@ test: mdadm mdmon test_stripe swap_super raid6check
|
|
|
b7f731 |
clean :
|
|
|
b7f731 |
rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
|
|
|
b7f731 |
mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt .merge_file_* \
|
|
|
b7f731 |
- mdadm.Os mdadm.O2 mdmon.O2 \
|
|
|
b7f731 |
- mdassemble mdassemble.static mdassemble.auto mdassemble.uclibc \
|
|
|
b7f731 |
- mdassemble.klibc swap_super \
|
|
|
b7f731 |
+ mdadm.Os mdadm.O2 mdmon.O2 swap_super \
|
|
|
b7f731 |
init.cpio.gz mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon \
|
|
|
b7f731 |
mdadm.8
|
|
|
b7f731 |
|
|
|
b7f731 |
--
|
|
|
b7f731 |
2.7.4
|
|
|
b7f731 |
|