diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-28 22:36:26 +0200 |
| commit | 92116b44c20c9b8e3ee49b794084d08d22e87cd3 (patch) | |
| tree | ebfcd9f003924e328dd0ccdb16197c7e38c61dcf /core/lvm2/PKGBUILD | |
| parent | c89124d6a88f4cfffaba4492922c86091f2c8516 (diff) | |
| parent | 00f77ef3b2b7856520daba393370f67b773c2184 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/gnustep-base/PKGBUILD
community-testing/gtranslator/PKGBUILD
community-testing/parrot/PKGBUILD
community/chmsee/PKGBUILD
core/lvm2/PKGBUILD
extra/php/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-openssl/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
testing/cairo/PKGBUILD
testing/eog-plugins/PKGBUILD
testing/eog/PKGBUILD
testing/gedit/PKGBUILD
testing/gjs/PKGBUILD
testing/glib2/PKGBUILD
testing/gnome-documents/PKGBUILD
testing/gnome-shell/PKGBUILD
testing/gobject-introspection/PKGBUILD
testing/libpeas/PKGBUILD
testing/mutter/PKGBUILD
testing/openssl/PKGBUILD
testing/pygobject/PKGBUILD
testing/python/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/ruby/PKGBUILD
testing/ruby/ruby.install
testing/sushi/PKGBUILD
testing/totem/PKGBUILD
Diffstat (limited to 'core/lvm2/PKGBUILD')
| -rw-r--r-- | core/lvm2/PKGBUILD | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index 48435da86..f892eeabc 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 153950 2012-03-21 02:16:27Z eric $ +# $Id: PKGBUILD 157318 2012-04-26 22:51:18Z eric $ # 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=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') @@ -16,18 +16,16 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc} 11-dm-initramfs.rules) sha1sums=('f61dfbd8e9219291d11de3d70f0b3d20a29fae85' '45f5e31045065e7bdf5d6f2e21c857b4978024b4' - '7f108b2f2056eb050fc898bf5190ecf9145aed8a' + '08007f13cf1a9caf6e4aca76dd2ed6a4ab037601' '7d63aa838703c9f986531a78164b556f765f5cce' 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { cd "${srcdir}/LVM2.${pkgver}" - sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh unset LDFLAGS - ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \ - --includedir=/usr/include --with-usrlibdir=/usr/lib \ + ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc --localstatedir=/var \ --enable-pkgconfig --enable-readline --enable-dmeventd --enable-cmdlib --enable-applib \ - --with-udevdir=/lib/udev/rules.d/ --enable-udev_sync --enable-udev_rules + --enable-udev_sync --enable-udev_rules make } @@ -39,7 +37,7 @@ package_device-mapper() { cd "${srcdir}/LVM2.${pkgver}" 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" + install -D -m644 "${srcdir}/11-dm-initramfs.rules" "${pkgdir}/usr/lib/initcpio/udev/11-dm-initramfs.rules" } package_lvm2() { @@ -56,6 +54,6 @@ package_lvm2() { # /etc directories install -d "${pkgdir}"/etc/lvm/{archive,backup} # mkinitcpio hook - install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/lib/initcpio/hooks/lvm2" - install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/lib/initcpio/install/lvm2" + install -D -m644 "${srcdir}/lvm2_hook" "${pkgdir}/usr/lib/initcpio/hooks/lvm2" + install -D -m644 "${srcdir}/lvm2_install" "${pkgdir}/usr/lib/initcpio/install/lvm2" } |