diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-25 14:01:11 +0200 |
| commit | c94bf77ede06fa67fd3222ffa3fcad8898e1fd59 (patch) | |
| tree | 3e4cc7f273a07c12fd69c589da434717e523664f /core/lvm2/PKGBUILD | |
| parent | 0f89996e6f908cc405cd44478860b864dcb189f1 (diff) | |
| parent | 3b99c42eb8ca744e86e4e17197b1bf10642c6785 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/nginx/PKGBUILD
community-testing/nginx/nginx.install
community/chrony/PKGBUILD
community/lxdm/PKGBUILD
community/oidentd/PKGBUILD
community/oss/PKGBUILD
community/pdnsd/PKGBUILD
community/ruby-cairo/PKGBUILD
community/subtle/PKGBUILD
core/kmod/PKGBUILD
core/lvm2/PKGBUILD
core/openldap/PKGBUILD
core/systemd/PKGBUILD
extra/smartmontools/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'core/lvm2/PKGBUILD')
| -rw-r--r-- | core/lvm2/PKGBUILD | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 578d7762c..49780ffdc 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160347 2012-06-01 12:56:44Z dreisner $ +# $Id: PKGBUILD 162154 2012-06-22 12:56:20Z dreisner $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.95 -pkgrel=6.1 +pkgver=2.02.96 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -13,26 +13,25 @@ groups=('base') source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} lvm2_install lvm2_hook - 11-dm-initramfs.rules) -sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' - '45f5e31045065e7bdf5d6f2e21c857b4978024b4' + 11-dm-initramfs.rules + lvm.service + lvm2.conf) +sha1sums=('29d5097f0ca92c7665f29f862eca78bcf981ff6f' + '12e9016485c415c344524e6e75e23dfa6ca097ac' '3e1680f9b76ce9150d08865d99db90fd15532271' 'cedc9948123c870f9c5aa3357d0075b41a9c8135' - 'f6a554eea9557c3c236df2943bb6e7e723945c41') + 'f6a554eea9557c3c236df2943bb6e7e723945c41' + '17df8689630a77e46899a8bd56997d9db896d5af' + 'ccefad65fde3d50331a42b0e90a1539dc7c8b9e4') build() { cd "${srcdir}/LVM2.${pkgver}" unset LDFLAGS - # libudev.so.1.0.0 compat - sed -i 's,udev_get_dev_path([^)]\+),"/dev",' \ - tools/dmsetup.c \ - lib/misc/lvm-wrappers.c - - ./configure --prefix=/ --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ + ./configure --prefix=/ --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ --includedir=/usr/include --with-usrlibdir=/usr/lib --libdir=/usr/lib --with-udev-prefix=/usr \ - --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --enable-udev_sync --enable-udev_rules + --with-systemdsystemunitdir=/usr/lib/systemd/system --enable-pkgconfig --enable-readline \ + --enable-dmeventd --enable-cmdlib --enable-applib --enable-udev_sync --enable-udev_rules make } @@ -63,4 +62,7 @@ package_lvm2() { # mkinitcpio hook install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" + # systemd support + install -D -m644 "${srcdir}/lvm.service" "${pkgdir}/usr/lib/systemd/system/lvm.service" + install -D -m644 "${srcdir}/lvm2.conf" "${pkgdir}/usr/lib/tmpfiles.d/lvm2.conf" } |