[arch-commits] Commit in mdadm/trunk (7 files)

Tobias Powalowski tpowa at nymeria.archlinux.org
Fri May 17 06:17:11 EDT 2013


    Date: Friday, May 17, 2013 @ 12:17:11
  Author: tpowa
Revision: 185684

upgpkg: mdadm 3.2.6-4

remove rc.d file, move binaries to /usr/bin

Modified:
  mdadm/trunk/PKGBUILD
  mdadm/trunk/mdadm-fix-udev-rules.patch
  mdadm/trunk/mdadm.service
  mdadm/trunk/mdadm_hook
  mdadm/trunk/mdadm_install
  mdadm/trunk/mdadm_udev_install
Deleted:
  mdadm/trunk/mdadm

----------------------------+
 PKGBUILD                   |   33 +++++++++++++++++----------------
 mdadm                      |   42 ------------------------------------------
 mdadm-fix-udev-rules.patch |    8 ++++----
 mdadm.service              |    2 +-
 mdadm_hook                 |    2 +-
 mdadm_install              |    2 +-
 mdadm_udev_install         |    2 +-
 7 files changed, 25 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-17 08:29:13 UTC (rev 185683)
+++ PKGBUILD	2013-05-17 10:17:11 UTC (rev 185684)
@@ -3,7 +3,7 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 pkgname=mdadm
 pkgver=3.2.6
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
 arch=(i686 x86_64)
 license=('GPL')
@@ -13,7 +13,6 @@
 depends=('glibc')
 backup=('etc/mdadm.conf')
 source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2
-        mdadm 
         mdadm.conf 
         mdadm_install
         mdadm_hook
@@ -22,12 +21,24 @@
         disable-werror.patch
         mdadm-fix-udev-rules.patch)
 replaces=('raidtools')
+md5sums=('3e255dc71e5144bbcb872788ca647267'
+         '5a37c112aa07dccdde62f9fa5b888607'
+         'af2f73f0094ebee66f503ca4710c7142'
+         'fbfb7d07efcbaf5dc61af424c5f6e352'
+         'b6b0bfd6487c99264578630616dfe5eb'
+         'eb1786b18fa4d13cfd7b71d6b05cfb4f'
+         '4ad87b74a4bc9a34621280abe0e0c3e4'
+         '6c76f2f261c1c3397c7290633f0a9acc')
 
-build() {
+prepare() {
   cd $srcdir/$pkgname-$pkgver
   patch -Np0 -i ../disable-werror.patch
   patch -p1 -i ../mdadm-fix-udev-rules.patch
-  make CXFLAGS="$CFLAGS"
+}
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  make CXFLAGS="$CFLAGS" BINDIR=/usr/bin
   # build static mdassemble for Arch's initramfs
   make MDASSEMBLE_AUTO=1 mdassemble
   
@@ -35,22 +46,12 @@
 
 package() {
   cd $srcdir/$pkgname-$pkgver
-  make INSTALL=/usr/bin/install DESTDIR=$pkgdir install
-  install -D -m755 mdassemble $pkgdir/sbin/mdassemble
+  make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+  install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
   install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
-  install -D -m755 ../mdadm $pkgdir/etc/rc.d/mdadm
   install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
   install -D -m644 ../mdadm_hook $pkgdir/usr/lib/initcpio/hooks/mdadm
   install -D -m644 ../mdadm_udev_install $pkgdir/usr/lib/initcpio/install/mdadm_udev
   # systemd service file
   install -D -m644 $srcdir/mdadm.service $pkgdir/usr/lib/systemd/system/mdadm.service
 }
-md5sums=('3e255dc71e5144bbcb872788ca647267'
-         '8333d405f550317c2bacd5510bf1cb60'
-         '00cbed931db4f15b6ce49e3e7d433966'
-         '815245a3af16a73ec1c5e5989fb892e9'
-         'fbb5542d9bdf87441a11dd7e7a0a17f8'
-         '0e35422d0cc007c3654a5e2591a9f9b5'
-         'aafb5f9ac8437a284cbf948b9b13b179'
-         '4ad87b74a4bc9a34621280abe0e0c3e4'
-         '0bf45d6dcb3ea14facddbb10b3303806')

Deleted: mdadm
===================================================================
--- mdadm	2013-05-17 08:29:13 UTC (rev 185683)
+++ mdadm	2013-05-17 10:17:11 UTC (rev 185684)
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-pidfile=/run/mdadm.pid
-if [[ -r $pidfile ]]; then
-  read -r PID <"$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting mdadm RAID Monitor"
-    if [[ -z $PID ]] && mdadm --monitor --scan -i "$pidfile" -f; then
-      add_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping mdadm RAID Monitor"
-    if [[ $PID ]] && kill "$PID" &>/dev/null; then
-      rm_daemon mdadm
-      stat_done
-    else
-      stat_fail
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac

Modified: mdadm-fix-udev-rules.patch
===================================================================
--- mdadm-fix-udev-rules.patch	2013-05-17 08:29:13 UTC (rev 185683)
+++ mdadm-fix-udev-rules.patch	2013-05-17 10:17:11 UTC (rev 185684)
@@ -39,7 +39,7 @@
 +ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0", GOTO="md_end"
 +LABEL="md_ignore_state"
 +
-+IMPORT{program}="/sbin/mdadm --detail --export $devnode"
++IMPORT{program}="/usr/bin/mdadm --detail --export $devnode"
 +ENV{DEVTYPE}=="disk", ENV{MD_NAME}=="?*", SYMLINK+="disk/by-id/md-name-$env{MD_NAME}", OPTIONS+="string_escape=replace"
 +ENV{DEVTYPE}=="disk", ENV{MD_UUID}=="?*", SYMLINK+="disk/by-id/md-uuid-$env{MD_UUID}"
 +ENV{DEVTYPE}=="disk", ENV{MD_DEVNAME}=="?*", SYMLINK+="md/$env{MD_DEVNAME}"
@@ -75,9 +75,9 @@
 +
 +# remember you can limit what gets auto/incrementally assembled by
 +# mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY'
-+ACTION=="add", RUN+="/sbin/mdadm --incremental $devnode --offroot"
-+ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/sbin/mdadm -If $name --path $env{ID_PATH}"
-+ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/sbin/mdadm -If $name"
++ACTION=="add", RUN+="/usr/bin/mdadm --incremental $devnode --offroot"
++ACTION=="remove", ENV{ID_PATH}=="?*", RUN+="/usr/bin/mdadm -If $name --path $env{ID_PATH}"
++ACTION=="remove", ENV{ID_PATH}!="?*", RUN+="/usr/bin/mdadm -If $name"
 +
 +LABEL="md_inc_end"
 diff --git a/udev-md-raid.rules b/udev-md-raid.rules

Modified: mdadm.service
===================================================================
--- mdadm.service	2013-05-17 08:29:13 UTC (rev 185683)
+++ mdadm.service	2013-05-17 10:17:11 UTC (rev 185684)
@@ -2,7 +2,7 @@
 Description=MDADM Event Monitor
 
 [Service]
-ExecStart=/sbin/mdadm --monitor --scan
+ExecStart=/usr/bin/mdadm --monitor --scan
 
 [Install]
 WantedBy=multi-user.target

Modified: mdadm_hook
===================================================================
--- mdadm_hook	2013-05-17 08:29:13 UTC (rev 185683)
+++ mdadm_hook	2013-05-17 10:17:11 UTC (rev 185684)
@@ -43,7 +43,7 @@
     fi
 
     # assemble everything
-    [ -s "$mdconfig" ] && /sbin/mdassemble
+    [ -s "$mdconfig" ] && /usr/bin/mdassemble
 }
 
 # vim: set ft=sh ts=4 sw=4 et:

Modified: mdadm_install
===================================================================
--- mdadm_install	2013-05-17 08:29:13 UTC (rev 185683)
+++ mdadm_install	2013-05-17 10:17:11 UTC (rev 185684)
@@ -8,7 +8,7 @@
         echo "Custom /etc/mdadm.conf file will be used in initramfs for assembling arrays."
         add_file "/etc/mdadm.conf"
     fi
-    add_binary "/sbin/mdassemble"
+    add_binary "/usr/bin/mdassemble"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
 
     add_runscript

Modified: mdadm_udev_install
===================================================================
--- mdadm_udev_install	2013-05-17 08:29:13 UTC (rev 185683)
+++ mdadm_udev_install	2013-05-17 10:17:11 UTC (rev 185684)
@@ -9,7 +9,7 @@
         add_file "/etc/mdadm.conf"
     fi
 
-    add_binary "mdadm"
+    add_binary "/usr/bin/mdadm"
     add_file "/usr/lib/udev/rules.d/63-md-raid-arrays.rules"
     add_file "/usr/lib/udev/rules.d/64-md-raid-assembly.rules"
 }



More information about the arch-commits mailing list