Accepting request 129089 from home:fcrozat:branches:Base:System

- Add blkid-builtin.patch: use blkid built-in from udev (less fork, useful for dracut, please fwd for 12.2)

OBS-URL: https://build.opensuse.org/request/show/129089
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=67

blkid-builtin.patch

@@ -0,0 +1,13 @@
+Index: mdadm-3.2.5/udev-md-raid.rules
+===================================================================
+--- mdadm-3.2.5.orig/udev-md-raid.rules
++++ mdadm-3.2.5/udev-md-raid.rules
+@@ -40,7 +40,7 @@ ENV{DEVTYPE}=="partition", ENV{MD_UUID}=
+ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[^0-9]", SYMLINK+="md/$env{MD_DEVNAME}%n"
+ ENV{DEVTYPE}=="partition", ENV{MD_DEVNAME}=="*[0-9]", SYMLINK+="md/$env{MD_DEVNAME}p%n"
+ 
+-IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
++IMPORT{builtin}="blkid"
+ OPTIONS+="link_priority=100"
+ OPTIONS+="watch"
+ ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"

mdadm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 26 16:50:03 UTC 2012 - fcrozat@suse.com
+
+- Add blkid-builtin.patch: use blkid built-in from udev
+
 -------------------------------------------------------------------
 Thu Jul  5 03:14:43 UTC 2012 - nfbrown@suse.com
 

mdadm.spec

@@ -40,6 +40,7 @@ Source6:        mkinitrd-boot.sh
 Source7:        mdadm.cron
 Patch1:         udev-rules.fix
 Patch2:         mdmon-arg.fix
+Patch3:         blkid-builtin.patch
 
 %description
 Mdadm is a program that can be used to control Linux md devices. It is
@@ -50,6 +51,7 @@ programs but with a very different interface.
 %setup -q -a1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 make %{?_smp_mflags} CC="%__cc" CXFLAGS="$RPM_OPT_FLAGS -Wno-error"