mdadm: load default sysfs attributes after assemblation

[thirdparty/mdadm.git] / Makefile

diff --git a/Makefile b/Makefile
index 685069612617bd405c30efbd5d6658005e17410b..dfe00b0a0be807597cb979342c15867bd11c570f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,10 @@ KLIBC=/home/src/klibc/klibc-0.77
 
 KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIBC)/linux/include -I$(KLIBC)/klibc/arch/i386/include -I$(KLIBC)/klibc/include/bits32
 
+ifdef COVERITY
+COVERITY_FLAGS=-include coverity-gcc-hack.h
+endif
+
 CC ?= $(CROSS_COMPILE)gcc
 CXFLAGS ?= -ggdb
 CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
@@ -85,6 +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
 
 COROSYNC:=$(shell [ -d /usr/include/corosync ] || echo -DNO_COROSYNC)
 DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM)
@@ -176,6 +181,9 @@ everything-test: all mdadm.static swap_super test_stripe \
 # mdadm.uclibc doesn't work on x86-64
 # mdadm.tcc doesn't work..
 
+%.o: %.c
+       $(CC) $(CFLAGS) $(CPPFLAGS) $(COVERITY_FLAGS) -o $@ -c $<
+
 mdadm : $(OBJS) | check_rundir
        $(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
 
@@ -256,8 +264,10 @@ install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
        $(INSTALL) -D -m 644 md.4 $(DESTDIR)$(MAN4DIR)/md.4
        $(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
 
-install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules
-       @for file in 63-md-raid-arrays.rules 64-md-raid-assembly.rules ; \
+install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules udev-md-raid-creating.rules \
+               udev-md-clustered-confirm-device.rules 
+       @for file in 01-md-raid-creating.rules 63-md-raid-arrays.rules 64-md-raid-assembly.rules \
+               69-md-clustered-confirm-device.rules ; \
        do sed -e 's,BINDIR,$(BINDIR),g' udev-$${file#??-} > .install.tmp.1 && \
           $(ECHO) $(INSTALL) -D -m 644 udev-$${file#??-} $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \
           $(INSTALL) -D -m 644 .install.tmp.1 $(DESTDIR)$(UDEVDIR)/rules.d/$$file ; \
@@ -266,7 +276,11 @@ install-udev: udev-md-raid-arrays.rules udev-md-raid-assembly.rules
 
 install-systemd: systemd/mdmon@.service
        @for file in mdmon@.service mdmonitor.service mdadm-last-resort@.timer \
-               mdadm-last-resort@.service mdadm-grow-continue@.service; \
+               mdadm-last-resort@.service mdadm-grow-continue@.service \
+               mdcheck_start.timer mdcheck_start.service \
+               mdcheck_continue.timer mdcheck_continue.service \
+               mdmonitor-oneshot.timer mdmonitor-oneshot.service \
+               ; \
        do sed -e 's,BINDIR,$(BINDIR),g' systemd/$$file > .install.tmp.2 && \
           $(ECHO) $(INSTALL) -D -m 644 systemd/$$file $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
           $(INSTALL) -D -m 644 .install.tmp.2 $(DESTDIR)$(SYSTEMD_DIR)/$$file ; \
@@ -278,7 +292,7 @@ install-systemd: systemd/mdmon@.service
           $(INSTALL) -D -m 755  .install.tmp.3 $(DESTDIR)$(SYSTEMD_DIR)-shutdown/$$file ; \
           rm -f .install.tmp.3; \
        done
-       if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(SYSTEMD_DIR)/../scripts/mdadm_env.sh ;fi
+       if [ -f /etc/SuSE-release -o -n "$(SUSE)" ] ;then $(INSTALL) -D -m 755 systemd/SUSE-mdadm_env.sh $(DESTDIR)$(LIB_DIR)/mdadm_env.sh ;fi
 
 uninstall:
        rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
@@ -288,10 +302,10 @@ test: mdadm mdmon test_stripe swap_super raid6check
 
 clean :
        rm -f mdadm mdmon $(OBJS) $(MON_OBJS) $(STATICOBJS) core *.man \
-       mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt .merge_file_* \
-       mdadm.Os mdadm.O2 mdmon.O2 swap_super \
-       init.cpio.gz mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon \
-       mdadm.8
+       mdadm.tcc mdadm.uclibc mdadm.static *.orig *.porig *.rej *.alt \
+       .merge_file_* mdadm.Os mdadm.O2 mdmon.O2 swap_super init.cpio.gz \
+       mdadm.uclibc.static test_stripe raid6check raid6check.o mdmon mdadm.8
+       rm -rf cov-int
 
 dist : clean
        ./makedist