diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-17 11:48:34 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-17 11:48:34 -0300 |
| commit | a873bdc69d24650d832933463af71dfaa96f1a8a (patch) | |
| tree | eb1be50481efd38ce5ea6dbaab797af5866a764c /core | |
| parent | dceec836462f00192ea15364f86e3cfbac578bc0 (diff) | |
| parent | 68b7938bb87c6e91d54e4f35f0223c7237fa53e1 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/virtualbox/PKGBUILD
extra/live-media/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/libedit/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/lvm2/PKGBUILD | 21 |
2 files changed, 12 insertions, 15 deletions
diff --git a/core/libedit/PKGBUILD b/core/libedit/PKGBUILD index 13c0027b4..59b8c9433 100644 --- a/core/libedit/PKGBUILD +++ b/core/libedit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132376 2011-07-23 23:23:53Z bisson $ +# $Id: PKGBUILD 135574 2011-08-15 23:39:35Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Roman Cheplyaka <roma@ro-che.info> pkgname=libedit -pkgver=20110709_3.0 +pkgver=20110802_3.0 pkgrel=1 pkgdesc='Command line editor library providing generic line editing, history, and tokenization functions' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('BSD') depends=('ncurses') options=('!libtool') source=("http://www.thrysoee.dk/editline/libedit-${pkgver/_/-}.tar.gz") -sha1sums=('63a62e0c52a0a2b3c933f400039e24724498cfb4') +sha1sums=('b06e3cf248a4235617c71454e15ca3a54a61d467') build() { cd "${srcdir}/${pkgname}-${pkgver/_/-}" diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD index feac1a364..6c0322698 100644 --- a/core/lvm2/PKGBUILD +++ b/core/lvm2/PKGBUILD @@ -1,31 +1,30 @@ -# $Id: PKGBUILD 131232 2011-07-12 03:27:34Z eric $ +# $Id: PKGBUILD 135564 2011-08-15 21:08:52Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase=lvm2 pkgname=('lvm2' 'device-mapper') -pkgver=2.02.86 -_pkgverlvm=${pkgver} +pkgver=2.02.87 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://sourceware.org/lvm2/" license=('GPL2' 'LGPL2.1') groups=('base') -source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz +source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz lvm2_install lvm2_hook 11-dm-initramfs.rules) -md5sums=('3b42dec4d15ad106302a35149082a20e' +md5sums=('4c36c7f216edfe65a6193d2adc389ecd' 'dcb82506d732cc7b10159a89b579dba8' '8d613b84a175cd85f752a75198e40e15' '69e40679cd8b3658bfc619e48baae125') -sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c' +sha1sums=('4b217d405133bdc6120568253574a49fae2caa4f' '7f108b2f2056eb050fc898bf5190ecf9145aed8a' 'a0e0513c2efb183006e57e595d93ce18be297928' 'f6a554eea9557c3c236df2943bb6e7e723945c41') build() { - cd "${srcdir}/LVM2.${_pkgverlvm}" + 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 \ @@ -40,7 +39,7 @@ package_device-mapper() { url="http://sourceware.org/dm/" depends=('glibc' 'udev') - cd "${srcdir}/LVM2.${_pkgverlvm}" + 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" @@ -53,12 +52,10 @@ package_lvm2() { backup=('etc/lvm/lvm.conf') options=('!makeflags') - cd "${srcdir}/LVM2.${_pkgverlvm}" + cd "${srcdir}/LVM2.${pkgver}" make DESTDIR="${pkgdir}" install_lvm2 # install applib - cd liblvm - make DESTDIR="${pkgdir}" install - cd .. + make -C liblvm DESTDIR="${pkgdir}" install # /etc directories install -d "${pkgdir}"/etc/lvm/{archive,backup} # mkinitcpio hook |