diff options
| -rw-r--r-- | abs/core/iproute2/PKGBUILD | 19 | ||||
| -rw-r--r-- | abs/core/iproute2/iproutegetfix.patch | 10 | ||||
| -rw-r--r-- | abs/core/kernel26/PKGBUILD | 7 |
3 files changed, 15 insertions, 21 deletions
diff --git a/abs/core/iproute2/PKGBUILD b/abs/core/iproute2/PKGBUILD index fa31f11..a35b822 100644 --- a/abs/core/iproute2/PKGBUILD +++ b/abs/core/iproute2/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 107230 2011-01-22 18:51:34Z ronald $ +# $Id: PKGBUILD 127646 2011-06-17 12:59:11Z stephane $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=2.6.37 +pkgver=2.6.39 pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') 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') options=('!makeflags') backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \ '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 +source=(http://devresources.linux-foundation.org/dev/iproute2/download/iproute2-${pkgver}.tar.gz 'iproute2-fhs.patch') -sha1sums=('7852fb66fb745dc3c1fabee24d7d8ff017c48d36' - '2416b11252364d7a6c742eabb4a6924a75637a46') build() { cd $srcdir/iproute2-${pkgver} @@ -37,7 +37,14 @@ 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 } +md5sums=('8a3b6bc77c2ecf752284aa4a6fc630a6' + '39cf3de7ca9a8560ecb08433510b079c') diff --git a/abs/core/iproute2/iproutegetfix.patch b/abs/core/iproute2/iproutegetfix.patch deleted file mode 100644 index 182ff56..0000000 --- a/abs/core/iproute2/iproutegetfix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ip/iproute.c.orig 2010-08-12 13:50:37.510000024 +0200 -+++ ip/iproute.c 2010-08-12 13:51:05.100000024 +0200 -@@ -1286,6 +1286,7 @@ - memset(&req, 0, sizeof(req)); - - iproute_reset_filter(); -+ filter.cloned = 2; - - req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg)); - req.n.nlmsg_flags = NLM_F_REQUEST; diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD index fd6fec3..4677749 100644 --- a/abs/core/kernel26/PKGBUILD +++ b/abs/core/kernel26/PKGBUILD @@ -1,6 +1,4 @@ # $Id: PKGBUILD 130991 2011-07-09 12:23:51Z thomas $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer: Cecil Watson <knoppmyth@gmail.com> pkgbase="kernel26" pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kernel @@ -8,8 +6,7 @@ pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kern _kernelname=${pkgname#kernel26} _basekernel=2.6.39 pkgver=${_basekernel}.3 -pkgrel=7 -depends=('module-init-tools>=3.16') +pkgrel=8 makedepends=('xmlto' 'docbook-xsl') _archpatch=1 _patchname="patch-${pkgver}-${_archpatch}-ARCH" @@ -104,7 +101,7 @@ package_kernel26() { pkgdesc="The Linux Kernel and modules" groups=('base') backup=(etc/mkinitcpio.d/${pkgname}.preset) - depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.12-2' 'mkinitcpio>=0.6.8-2') + depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.12-2' 'mkinitcpio>=0.6.15') # pwc, ieee80211 and hostap-driver26 modules are included in kernel26 now # nforce package support was abandoned by nvidia, kernel modules should cover everything now. # kernel24 support is dropped since glibc24 |