summaryrefslogtreecommitdiffstats
path: root/abs/core/lvm2
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2011-08-06 01:13:55 (GMT)
committerJames Meyer <james.meyer@operamail.com>2011-08-06 01:13:55 (GMT)
commit12d025b342ea99681a2b9d830a153ced182daca1 (patch)
treed9943ed95e570c0706c6b5021b4570894877325a /abs/core/lvm2
parentbcfb3dc1bd231f91914f917149164d41a2f3ce0a (diff)
parent9cc464bde03a97d6cbea14420b1b2ee32ca3ca00 (diff)
downloadlinhes_pkgbuild-12d025b342ea99681a2b9d830a153ced182daca1.zip
linhes_pkgbuild-12d025b342ea99681a2b9d830a153ced182daca1.tar.gz
linhes_pkgbuild-12d025b342ea99681a2b9d830a153ced182daca1.tar.bz2
Merge branch 'testing' of ssh://jams@linhes.org/mount/repository/linhes_pkgbuild into testing
Diffstat (limited to 'abs/core/lvm2')
-rw-r--r--abs/core/lvm2/ChangeLog103
-rw-r--r--abs/core/lvm2/PKGBUILD27
-rw-r--r--abs/core/lvm2/lvm2_hook8
-rw-r--r--abs/core/lvm2/lvm2_install5
4 files changed, 23 insertions, 120 deletions
diff --git a/abs/core/lvm2/ChangeLog b/abs/core/lvm2/ChangeLog
deleted file mode 100644
index 5809ab5..0000000
--- a/abs/core/lvm2/ChangeLog
+++ /dev/null
@@ -1,103 +0,0 @@
-2010-07-11 Thomas Bächler <thomas@archlinux.org>
-
- * lvm2/device-mapper 2.02.70-1
- * Upstream update
- * Do not move the dmeventd manpage, has been fixed upstream
- * Remove all the || return 1 in PKGBUILD
-
-2010-07-01 Eric Belanger <eric@archlinux.org>
-
- * lvm2/device-mapper 2.02.69-1
- * Upstream update
- * Moved dmeventd man page from lvm2 to device-mapper package
-
-2010-06-25 Eric Belanger <eric@archlinux.org>
-
- * lvm2/device-mapper 2.02.68-1
- * Upstream update
- * Fixed tr path in lvmdump
-
-2010-04-05 Eric Belanger <eric@archlinux.org>
-
- * lvm2/device-mapper 2.02.62-1
- * Upstream update
- * Fixed license
-
-2010-02-27 Eric Belanger <eric@archlinux.org>
-
- * lvm2/device-mapper 2.02.61-1
- * Upstream update
-
-2010-01-24 Thomas Bächler <thomas@archlinux.org>
- * lvm2/device-mapper 2.02.60-2
- * Rebuilt without -Wl,--as-needed, it breaks dmeventd monitoring
-
-2010-01-24 Thomas Bächler <thomas@archlinux.org>
- * lvm2/device-mapper update to 2.02.60-1
- * Clean up PKGBUILD, fix internal paths to dmeventd and its helpers
-
-2009-11-27 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.56-1
- * device-mapper 1.02.40-1
- * Upstream update
-
-2009-10-31 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.54-1
- * device-mapper 1.02.39-1
- * Upstream update
- * Enabled the device-mapper event daemon
- * Moved the udev rule from /etc to /lib
-
-2009-09-27 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.53-1
- * device-mapper 1.02.38-1
- * Upstream update
-
-2009-09-18 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.52-1
- * device-mapper 1.02.37-1
- * Upstream update
- * Implemented split packages
- * PKGBUILD clean up
- * Renamed pkgconfig file (close FS#15909)
-
-2009-07-09 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.48-1
- * device-mapper 1.02.33-1
- * Upstream update
- * Removed unneeded readline depends (close FS#15205)
-
-2009-05-24 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.47-1
- * device-mapper 1.02.32-1
- * Upstream update
- * Added dmsetup.static
-
-2009-03-07 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.45-1
- * device-mapper 1.02.31-1
- * Upstream update
-
-2009-01-31 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.44-1
- * device-mapper 1.02.30-1
- * Upstream update
- * Added bash depends
- * Added readline depends
- * Added pkgconfig file
-
-2008-11-11 Eric Belanger <eric@archlinux.org>
-
- * lvm2 2.02.43-1
- * device-mapper 1.02.29-1
- * Upstream update
- * Disabled SMP build
- * Added ChangeLog
diff --git a/abs/core/lvm2/PKGBUILD b/abs/core/lvm2/PKGBUILD
index 7c893c7..b54e9f6 100644
--- a/abs/core/lvm2/PKGBUILD
+++ b/abs/core/lvm2/PKGBUILD
@@ -1,20 +1,28 @@
-# $Id: PKGBUILD 97356 2010-10-30 01:06:16Z eric $
-# Maintainer: Eric Belanger <eric@archlinux.org>
+# $Id$
+# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.77
+pkgver=2.02.86
_pkgverlvm=${pkgver}
pkgrel=1
arch=('i686' 'x86_64')
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)
+ lvm2_hook
+ 11-dm-initramfs.rules)
+md5sums=('3b42dec4d15ad106302a35149082a20e'
+ 'dcb82506d732cc7b10159a89b579dba8'
+ '8d613b84a175cd85f752a75198e40e15'
+ '69e40679cd8b3658bfc619e48baae125')
+sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c'
+ '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
+ 'a0e0513c2efb183006e57e595d93ce18be297928'
+ 'f6a554eea9557c3c236df2943bb6e7e723945c41')
build() {
cd "${srcdir}/LVM2.${_pkgverlvm}"
@@ -24,7 +32,7 @@ build() {
--includedir=/usr/include --with-usrlibdir=/usr/lib \
--enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \
--with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules
- make || return 1
+ make
}
package_device-mapper() {
@@ -34,12 +42,14 @@ package_device-mapper() {
cd "${srcdir}/LVM2.${_pkgverlvm}"
make DESTDIR="${pkgdir}" install_device-mapper
+ # extra udev rule for device-mapper in initramfs
+ install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/lib/initcpio/udev/11-dm-initramfs.rules"
}
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')
@@ -55,6 +65,3 @@ package_lvm2() {
install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2"
install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2"
}
-md5sums=('e3cb5b86668ff08b337524f63ad82cde'
- 'f781c9f5dd4f9934952c687b73d26a18'
- '95bed25bdbc2c2d8500e7a07aeff7f65')
diff --git a/abs/core/lvm2/lvm2_hook b/abs/core/lvm2/lvm2_hook
index 13183c6..874b91d 100644
--- a/abs/core/lvm2/lvm2_hook
+++ b/abs/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
@@ -17,9 +18,8 @@ run_hook ()
[ "${quiet}" = "y" ] && LVMQUIET=">/dev/null"
- msg "Scanning logical volumes..."
- eval /sbin/lvm vgscan --ignorelockingfailure $LVMQUIET
msg "Activating logical volumes..."
- eval /sbin/lvm vgchange --ignorelockingfailure --ignoremonitoring -ay $LVMQUIET
+ [ -d /etc/lvm ] && /sbin/lvm vgscan --sysinit
+ eval /sbin/lvm vgchange --sysinit -a y $LVMQUIET
fi
}
diff --git a/abs/core/lvm2/lvm2_install b/abs/core/lvm2/lvm2_install
index 4ce9f18..94175b5 100644
--- a/abs/core/lvm2/lvm2_install
+++ b/abs/core/lvm2/lvm2_install
@@ -1,20 +1,19 @@
# 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_binary "/sbin/dmeventd"
add_file "/lib/udev/rules.d/10-dm.rules"
add_file "/lib/udev/rules.d/13-dm-disk.rules"
add_file "/lib/udev/rules.d/95-dm-notify.rules"
add_file "/lib/udev/rules.d/11-dm-lvm.rules"
+ add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
}
help ()