--- PKGBUILD.orig 2013-07-06 15:35:38.534234768 -0700 +++ PKGBUILD 2013-07-06 13:05:47.028556631 -0700 @@ -3,7 +3,7 @@ # Maintainer: Thomas Bächler pkgbase=lvm2 -pkgname=('lvm2' 'device-mapper') +pkgname=('lvm2-git' 'device-mapper-git') pkgver=2.02.98 pkgrel=4 arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL2' 'LGPL2.1') makedepends=('systemd') groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} +source=(git://git.fedorahosted.org/lvm2.git lvm2_install lvm2_hook 11-dm-initramfs.rules @@ -21,8 +21,7 @@ lvm-monitoring.service lvmetad.service lvmetad.socket) -sha1sums=('077425115b164c335a9930df745943e9ea666a8a' - 'SKIP' +sha1sums=('SKIP' '76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f' 'ff0fdf0a3005a41acd4b36865056109effc3474b' 'f6a554eea9557c3c236df2943bb6e7e723945c41' @@ -33,8 +32,13 @@ 'f857a4a63fcc604a981e56875edda91767d4f1bf' 'fcfc265e3b10294cc4b10949a342e9db4310b186') +pkgver() { + cd "$pkgbase" + git describe | sed 's/^v//;s/-/./g' +} + build() { - cd "${srcdir}/LVM2.${pkgver}" + cd "${srcdir}/${pkgbase}" unset LDFLAGS ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ @@ -46,12 +50,14 @@ make } -package_device-mapper() { +package_device-mapper-git() { pkgdesc="Device mapper userspace library and tools" url="http://sourceware.org/dm/" depends=('glibc' 'systemd') + conflicts=('device-mapper') + provides=('device-mapper') - cd "${srcdir}/LVM2.${pkgver}" + cd "${srcdir}/${pkgbase}" make DESTDIR="${pkgdir}" install_device-mapper # extra udev rule for device-mapper in initramfs install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" @@ -62,15 +68,16 @@ ln -sf /usr/lib/systemd/system/dmeventd.socket "${pkgdir}/usr/lib/systemd/system/sockets.target.wants/dmeventd.socket" } -package_lvm2() { +package_lvm2-git() { pkgdesc="Logical Volume Manager 2 utilities" - depends=('bash' "device-mapper>=${pkgver}" 'systemd' 'readline') - conflicts=('lvm' 'mkinitcpio<0.7') + depends=('bash' "device-mapper-git>=${pkgver}" 'systemd' 'readline') + conflicts=('lvm' 'lvm2' 'mkinitcpio<0.7') + provides=('lvm2') backup=('etc/lvm/lvm.conf') options=('!makeflags') install=lvm2.install - cd "${srcdir}/LVM2.${pkgver}" + cd "${srcdir}/${pkgbase}" make DESTDIR="${pkgdir}" install_lvm2 # install applib make -C liblvm DESTDIR="${pkgdir}" install