diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-02 12:00:40 +0200 |
| commit | c2ef76f233a03e87ba6f2a39ca06d6c8411525bd (patch) | |
| tree | 443d415b43358dbcc1043b51f3299d3b07ee3c73 /core/mdadm | |
| parent | 3bcb803af0dd81dc1d1e3352d8dee1d731d33abb (diff) | |
| parent | defe74c9cba07c321ad2869d8f6872e64a167324 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/open-vm-tools/PKGBUILD
community-testing/open-vm-tools/vmware-guestd
extra/exo/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/imagemagick/PKGBUILD
extra/libindi/PKGBUILD
extra/libxfce4util/PKGBUILD
extra/terminal/PKGBUILD
extra/xfburn/PKGBUILD
extra/xfce4-appfinder/PKGBUILD
extra/xfce4-dev-tools/PKGBUILD
extra/xfce4-mailwatch-plugin/PKGBUILD
extra/xfce4-notifyd/PKGBUILD
extra/xfce4-panel/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
extra/xfce4-smartbookmark-plugin/PKGBUILD
extra/xfce4-weather-plugin/PKGBUILD
testing/cairo/PKGBUILD
testing/lvm2/PKGBUILD
testing/openmpi/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'core/mdadm')
| -rw-r--r-- | core/mdadm/PKGBUILD | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index 6b3fabee0..d80e88886 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 147125 2012-01-22 11:01:03Z tpowa $ +# $Id: PKGBUILD 157942 2012-04-30 07:17:54Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.3 -pkgrel=1 +pkgrel=2 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -41,13 +41,13 @@ build() { package() { cd $srcdir/$pkgname-$pkgver - make INSTALL=/bin/install DESTDIR=$pkgdir install + make INSTALL=/usr/bin/install DESTDIR=$pkgdir install install -D -m755 mdassemble $pkgdir/sbin/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/lib/initcpio/install/mdadm - install -D -m644 ../mdadm_hook $pkgdir/lib/initcpio/hooks/mdadm - install -D -m644 ../mdadm_udev_install $pkgdir/lib/initcpio/install/mdadm_udev + 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 # symlink for backward compatibility - ln -sf /lib/initcpio/hooks/mdadm $pkgdir/lib/initcpio/hooks/raid + ln -sf /usr/lib/initcpio/hooks/mdadm $pkgdir/usr/lib/initcpio/hooks/raid } |