Merge branch '3.1' into 3.2

This commit is contained in:
Fredrik Rinnestam 2015-06-30 00:19:50 +02:00
commit 8435b24c23
3 changed files with 9 additions and 2 deletions

View File

@ -76,6 +76,7 @@ drwxr-xr-x root/root usr/man/man8/
-rw-r--r-- root/root usr/man/man8/rtstat.8.gz -rw-r--r-- root/root usr/man/man8/rtstat.8.gz
-rw-r--r-- root/root usr/man/man8/ss.8.gz -rw-r--r-- root/root usr/man/man8/ss.8.gz
-rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz -rw-r--r-- root/root usr/man/man8/tc-bfifo.8.gz
-rw-r--r-- root/root usr/man/man8/tc-bpf.8.gz
-rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq-details.8.gz
-rw-r--r-- root/root usr/man/man8/tc-cbq.8.gz -rw-r--r-- root/root usr/man/man8/tc-cbq.8.gz
-rw-r--r-- root/root usr/man/man8/tc-choke.8.gz -rw-r--r-- root/root usr/man/man8/tc-choke.8.gz

View File

@ -1,3 +1,3 @@
3adc263ade4ee76c35032e8f50b54108 iproute2-4.0.0.tar.xz 37efb479b3943b60c449ea02362b5ffc iproute2-4.1.0.tar.xz
7b469125cfe2d9916ba03f7c65b9dcd5 lo.iproute2 7b469125cfe2d9916ba03f7c65b9dcd5 lo.iproute2
826848debe693f2e2a3e235ce9abe601 net.iproute2 826848debe693f2e2a3e235ce9abe601 net.iproute2

View File

@ -4,16 +4,22 @@
# Depends on: db iptables # Depends on: db iptables
name=iproute2 name=iproute2
version=4.0.0 version=4.1.0
release=1 release=1
source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz \ source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz \
lo.iproute2 net.iproute2) lo.iproute2 net.iproute2)
build() { build() {
cd $name-$version cd $name-$version
# tipc depends on libmnl
rm -r tipc
sed -i '/^SUBDIRS/s/tipc//' Makefile
./configure ./configure
make CCOPTS="$CFLAGS" make CCOPTS="$CFLAGS"
make MANDIR=/usr/man DESTDIR=$PKG install make MANDIR=/usr/man DESTDIR=$PKG install
rm -r $PKG/usr/share rm -r $PKG/usr/share
install -D -m 0755 $SRC/lo.iproute2 $PKG/etc/rc.d/lo install -D -m 0755 $SRC/lo.iproute2 $PKG/etc/rc.d/lo
install -D -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net install -D -m 0755 $SRC/net.iproute2 $PKG/etc/rc.d/net