diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
| commit | 66873986693bc3c8812d12f3919f1977b9a30674 (patch) | |
| tree | 14a385b80dfa23890d9d864dd89fafb61dd38ff2 /core/lvm2 | |
| parent | fa448c3d0b12a414235560d2cbd14eb74aace7bd (diff) | |
| parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/puzzles/PKGBUILD
core/lvm2/PKGBUILD
core/mdadm/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'core/lvm2')
| -rw-r--r-- | core/lvm2/PKGBUILD | 15 | ||||
| -rw-r--r-- | core/lvm2/lvm2_hook | 3 | ||||
| -rw-r--r-- | core/lvm2/lvm2_install | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 9589fa588..35f1c7ae8 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125735 2011-05-28 17:12:36Z thomas $ +# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -6,25 +6,24 @@ pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') pkgver=2.02.85 _pkgverlvm=${pkgver} -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -conflicts=('mkinitcpio<0.5.99') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz lvm2_install lvm2_hook Be-quiet-on-removing-cache-on-read-only-fs.diff 11-dm-initramfs.rules) md5sums=('91785ca438e5ce679dd3a386b183d552' - '9fbe01c6e3fca4634b4a38ecdc2f562f' - 'cf05f2c7281e24269ea9dcc6b4e106ba' + 'dcb82506d732cc7b10159a89b579dba8' + '8d613b84a175cd85f752a75198e40e15' '6db89da27928d2415a8e26cd0a842712' '69e40679cd8b3658bfc619e48baae125') sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7' - '3f11db76189bcbc32d6b16a1b05ca3499e3e7b47' - '1cd20e8fbad6fd7d5c0f54e831fbf58ae564b440' + '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + 'a0e0513c2efb183006e57e595d93ce18be297928' '6d7dd04be291d7537235704c816a701fd5beacc0' 'f6a554eea9557c3c236df2943bb6e7e723945c41') @@ -54,7 +53,7 @@ package_device-mapper() { package_lvm2() { pkgdesc="Logical Volume Manager 2 utilities" depends=('bash' "device-mapper>=${pkgver}" 'udev' 'readline') - conflicts=('lvm' 'mkinitcpio<0.5.99') + conflicts=('lvm' 'mkinitcpio<0.7') backup=('etc/lvm/lvm.conf') options=('!makeflags') diff --git a/core/lvm2/lvm2_hook b/core/lvm2/lvm2_hook index 86d2ea582..874b91d06 100644 --- a/core/lvm2/lvm2_hook +++ b/core/lvm2/lvm2_hook @@ -4,7 +4,8 @@ run_hook () /sbin/modprobe -q dm-mod >/dev/null 2>&1 if [ -e "/sys/class/misc/device-mapper" ]; then if [ ! -e "/dev/mapper/control" ]; then - /bin/mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') + mkdir /dev/mapper + mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |') fi # If the lvmwait= parameter has been specified on the command line diff --git a/core/lvm2/lvm2_install b/core/lvm2/lvm2_install index 0df69f81b..94175b523 100644 --- a/core/lvm2/lvm2_install +++ b/core/lvm2/lvm2_install @@ -1,13 +1,12 @@ # vim: set ft=sh: -install () +build() { MODULES=" dm-mod dm-snapshot dm-mirror" BINARIES="" FILES="" SCRIPT="lvm2" - add_dir "/dev/mapper" add_binary "/sbin/lvm" add_binary "/sbin/dmsetup" add_file "/lib/udev/rules.d/10-dm.rules" |