[mdadm: 17/17] Merge remote branch 'origin/f13/master'

[Doug Ledford]

commit 73d2cf2972844d32ca2a3d394860dee9e771da38
Merge: 0167dcd deeee5b
Author: Doug Ledford <dledford at redhat.com>
Date:   Wed Aug 4 17:04:17 2010 -0400

    Merge remote branch 'origin/f13/master'
    
    Conflicts:
    	.gitignore
    	mdadm-2.5.2-static.patch
    	mdadm.rules
    	mdadm.spec
    	sources

 mdadm-2.5.2-static.patch |   19 +++++++++++++++----
 mdadm.spec               |    8 ++++----
 2 files changed, 19 insertions(+), 8 deletions(-)
---
diff --cc mdadm-2.5.2-static.patch
index 96f2d24,a0cd1c3..843c2f0
--- a/mdadm-2.5.2-static.patch
+++ b/mdadm-2.5.2-static.patch
@@@ -1,19 -1,19 +1,30 @@@
 ---- mdadm-3.1.2/Makefile.static	2010-04-06 11:55:03.098505021 -0400
 -+++ mdadm-3.1.2/Makefile	2010-04-06 11:55:44.120254408 -0400
 -@@ -62,9 +62,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)
 +--- mdadm-3.1.3-git20100804/Makefile.static	2010-07-28 23:50:15.000000000 -0400
- +++ mdadm-3.1.3-git20100804/Makefile	2010-08-04 10:42:10.974092317 -0400
+++++ mdadm-3.1.3-git20100804/Makefile	2010-08-04 11:28:08.603342301 -0400
 +@@ -68,9 +68,9 @@ CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)
   # pivotroot from early boot to late boot.
 - # If you don't have /lib/init/rw you might want to use /dev/.something
 - #  e.g. make MAP_DIR=/dev/.mdadm
 --MAP_DIR = /lib/init/rw/mdadm
 + # /dev is an odd place to put this, but it is the only directory that
 + # meets the requirements.
 +-MAP_DIR=/dev/.mdadm
  -MAP_FILE = map
 --MDMON_DIR = /lib/init/rw/mdmon
 -+MAP_DIR = /dev/md
 +-MDMON_DIR = /dev/.mdadm
 ++MAP_DIR=/dev/md
  +MAP_FILE = md-device-map
  +MDMON_DIR = /dev/md
   DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
   DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
   CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS)
- @@ -224,16 +224,16 @@ install : mdadm mdmon install-man instal
 -@@ -206,16 +206,16 @@ install : mdadm mdmon install-man instal
++@@ -165,9 +165,8 @@ mdadm.O2 : $(SRCS) mdadm.h mdmon.O2
++ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
++ 	$(CC) -o mdmon.O2 $(CFLAGS) $(LDFLAGS) -DHAVE_STDINT_H -O2 -D_FORTIFY_SOURCE=2 $(MON_SRCS)
++ 
++-# use '-z now' to guarantee no dynamic linker interactions with the monitor thread
++ mdmon : $(MON_OBJS)
++-	$(CC) $(LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
+++	$(CC) $(LDFLAGS) -o mdmon $(MON_OBJS) $(LDLIBS)
++ msg.o: msg.c msg.h
++ 
++ test_stripe : restripe.c mdadm.h
++@@ -224,16 +223,16 @@ install : mdadm mdmon install-man instal
   	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
   
   install-static : mdadm.static install-man
@@@ -34,23 -34,3 +45,23 @@@
   
   install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8
   	$(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8
- --- mdadm-3.1.3-git20100804/mapfile.c.static	2010-08-04 10:42:21.262967297 -0400
- +++ mdadm-3.1.3-git20100804/mapfile.c	2010-08-04 10:44:23.364005761 -0400
++--- mdadm-3.1.3-git20100804/mapfile.c.static	2010-07-28 23:50:15.000000000 -0400
+++++ mdadm-3.1.3-git20100804/mapfile.c	2010-08-04 11:27:35.391342438 -0400
 +@@ -60,9 +60,15 @@
 + 			dir "/" base ".lock",			\
 + 			dir }
 + 
 +-#define MAP_DIRS 2
 ++/* 
 ++ * one ring to bind them all...
 ++ *
 ++ * We only use a single map file location.  The multiple locations issue
 ++ * has caused more confusion than it was worth.
 ++ * Doug Ledford <dledford at redhat.com>
 ++ */
 ++#define MAP_DIRS 1
 + char *mapname[MAP_DIRS][4] = {
 +-	mapnames("/var/run/mdadm", "map"),
 + 	mapnames(MAP_DIR, MAP_FILE),
 + };
 + 
diff --cc mdadm.spec
index e14778f,f4699c6..ca40354
--- a/mdadm.spec
+++ b/mdadm.spec
@@@ -74,18 -73,10 +75,17 @@@ f
  %attr(0700,root,root) %dir /var/run/mdadm
  
  %changelog
 +* Wed Aug 04 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100804.2
 +- Add udev patch to not have incremental assembly in two rules files
 +
 +* Wed Aug 04 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100804.1
 +- Update to latest upstream release (resolves an issue with stale lock
 +  files on the md device map file)
 +
  * Thu Jul 22 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100722.2
- - Comment out the incremental assembly rules from the main udev rule file
-   so we can control it in our own incremental assembly specific rule file
- - Don't build the static package, we don't install it, also remove the
-   glibc-static buildreq
+ - Remove the glibc-static buildreq and don't build the static mdadm since
+   we don't install it anyway
+ - Remove the udev file since adding it was supposed to be a rawhide only change
  
  * Thu Jul 22 2010 Doug Ledford <dledford at redhat.com> - 3.1.3-0.git20100722.1
  - Change git date format to the correct format (YYYYMMDD)