diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 11:18:50 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 11:18:50 -0300 |
commit | be51ad4280764191b91e8c27baca29a30475e483 (patch) | |
tree | 0794eb362f0c718d1c199efef58eb7248d27f311 /core/iproute2 | |
parent | 06a22f3bf7a44edf24bd02b6023cf05a6bc77256 (diff) | |
parent | 8634a064b17334eb58699897220aeed2fc9a54db (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/solfege/PKGBUILD
core/udev/PKGBUILD
testing/moc/PKGBUILD
testing/mod_perl/PKGBUILD
testing/pidgin/PKGBUILD
Diffstat (limited to 'core/iproute2')
-rw-r--r-- | core/iproute2/PKGBUILD | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD index 401e43d6f..499584d3f 100644 --- a/core/iproute2/PKGBUILD +++ b/core/iproute2/PKGBUILD @@ -1,15 +1,17 @@ -# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $ +# $Id: PKGBUILD 126335 2011-06-04 22:38:16Z tomegun $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=2.6.37 -pkgrel=1 +pkgver=2.6.38 +pkgrel=3 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') url="http://www.linux-foundation.org/en/Net:Iproute2" -depends=('linux-atm' 'perl') +depends=('perl') +makedepends=('linux-atm') +optdepends=('linux-atm: ATM support') provides=('iproute') conflicts=('iproute') replaces=('iproute') @@ -18,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.bz2 'iproute2-fhs.patch') -sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36' +sha1sums=('e9f6d457a06866a2a20a6cba6b3a039b2ec3e14a' '2416b11252364d7a6c742eabb4a6924a75637a46') build() { @@ -37,6 +39,11 @@ package() { make DESTDIR=$pkgdir install + # allow loopback to be started before /usr is mounted, this may not be supported in the future + mkdir -p ${pkgdir}/sbin + mv ${pkgdir}/usr/sbin/ip ${pkgdir}/sbin/ip + ln -s /sbin/ip ${pkgdir}/usr/sbin/ip + # libnetlink isn't installed, install it FS#19385 install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a |