[arch-commits] Commit in iproute2/trunk (PKGBUILD iproute2-fhs.patch tc.patch)
Ronald van Haren
ronald at archlinux.org
Fri Aug 6 09:53:18 UTC 2010
Date: Friday, August 6, 2010 @ 05:53:18
Author: ronald
Revision: 86870
upgpkg: iproute2 2.6.35-1
update to latest version; update fhs patches to latest version
Modified:
iproute2/trunk/PKGBUILD
iproute2/trunk/iproute2-fhs.patch
Deleted:
iproute2/trunk/tc.patch
--------------------+
PKGBUILD | 25 +++++++++-------------
iproute2-fhs.patch | 57 +++++++++++++++++++++++++++++++++++++--------------
tc.patch | 26 -----------------------
3 files changed, 53 insertions(+), 55 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-05 18:05:35 UTC (rev 86869)
+++ PKGBUILD 2010-08-06 09:53:18 UTC (rev 86870)
@@ -3,8 +3,8 @@
# Contributor: Judd Vinet <jvinet at zeroflux.org>
pkgname=iproute2
-pkgver=2.6.34
-pkgrel=2
+pkgver=2.6.35
+pkgrel=1
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -17,28 +17,25 @@
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
- 'iproute2-fhs.patch' 'tc.patch')
-sha1sums=('b57f98e284c68a464b9c3e132d29760de6331688'
- 'ae7c4529555e1dce389fcedcbb7e0df5c726741a'
- 'de7ffa44922741c1239e1715e1d81d8f4e7b04e4')
+ 'iproute2-fhs.patch')
+sha1sums=('862b86ac73ea696867675765d119654553a22aeb'
+ '2416b11252364d7a6c742eabb4a6924a75637a46')
build() {
cd $srcdir/iproute2-${pkgver}
# set correct fhs structure
- patch -Np1 -i ${srcdir}/iproute2-fhs.patch || return 1
- patch -Np0 -i ${srcdir}/tc.patch || return 1
- ./configure || return 1
- make || return 1
+ patch -Np1 -i ${srcdir}/iproute2-fhs.patch
+ ./configure
+ make
}
package() {
cd $srcdir/iproute2-${pkgver}
- make DESTDIR=$pkgdir install || return 1
+ make DESTDIR=$pkgdir install
# libnetlink isn't installed, install it FS#19385
- install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h || return 1
- install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a || return 1
+ install -Dm644 include/libnetlink.h ${pkgdir}/usr/include/libnetlink.h
+ install -Dm644 lib/libnetlink.a ${pkgdir}/usr/lib/libnetlink.a
}
-
Modified: iproute2-fhs.patch
===================================================================
--- iproute2-fhs.patch 2010-08-05 18:05:35 UTC (rev 86869)
+++ iproute2-fhs.patch 2010-08-06 09:53:18 UTC (rev 86870)
@@ -17,21 +17,6 @@
# Path to db_185.h include
DBM_INCLUDE:=$(ROOTDIR)/usr/include
-diff -Naur iproute2.old/netem/Makefile iproute2-2.6.29/netem/Makefile
---- iproute2.old/netem/Makefile 2009-11-11 22:05:21.284750207 +0100
-+++ iproute2-2.6.29/netem/Makefile 2009-11-11 22:07:54.674736924 +0100
-@@ -20,9 +20,9 @@
- $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
-
- install: all
-- mkdir -p $(DESTDIR)/lib/tc
-+ mkdir -p $(DESTDIR)/${SHAREDIR}/tc
- for i in $(DISTDATA); \
-- do install -m 755 $$i $(DESTDIR)/lib/tc; \
-+ do install -m 755 $$i $(DESTDIR)/${SHAREDIR}/tc; \
- done
-
- clean:
diff -Naur iproute2.old/tc/tc_util.c iproute2-2.6.29/tc/tc_util.c
--- iproute2.old/tc/tc_util.c 2009-11-11 22:05:21.298076943 +0100
+++ iproute2-2.6.29/tc/tc_util.c 2009-11-11 22:09:32.865152646 +0100
@@ -55,3 +40,45 @@
return lib_dir;
}
+diff -Naur iproute2.old/netem/Makefile iproute2-2.6.35/netem/Makefile
+--- iproute2.old/netem/Makefile 2010-08-06 11:30:48.640940183 +0200
++++ iproute2-2.6.35/netem/Makefile 2010-08-06 11:32:34.210908892 +0200
+@@ -20,9 +20,9 @@
+ $(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+
+ install: all
+- mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ mkdir -p $(DESTDIR)$(SHAREDIR)/tc
+ for i in $(DISTDATA); \
+- do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ do install -m 644 $$i $(DESTDIR)$(SHAREDIR)/tc; \
+ done
+
+ clean:
+diff -Naur iproute2.old/tc/Makefile iproute2-2.6.35/tc/Makefile
+--- iproute2.old/tc/Makefile 2010-08-06 11:48:35.607472252 +0200
++++ iproute2-2.6.35/tc/Makefile 2010-08-06 11:49:36.977473380 +0200
+@@ -99,18 +99,11 @@
+ $(AR) rcs $@ $(TCLIB)
+
+ install: all
+- mkdir -p $(MODDESTDIR)
+- install -m 0755 tc $(DESTDIR)$(SBINDIR)
+- for i in $(TCSO); \
+- do install -m 755 $$i $(MODDESTDIR); \
+- done
+- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+- if [ -f $(MODDESTDIR)/m_xt.so ]; \
+- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
+- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
+- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
+- fi; \
+- fi
++ mkdir -p $(DESTDIR)$(LIBDIR)/tc
++ install -m 0755 tc $(DESTDIR)$(SBINDIR)
++ for i in $(TCSO); \
++ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
++ done
+
+ clean:
+ rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
Deleted: tc.patch
===================================================================
--- tc.patch 2010-08-05 18:05:35 UTC (rev 86869)
+++ tc.patch 2010-08-06 09:53:18 UTC (rev 86870)
@@ -1,26 +0,0 @@
---- tc/Makefile.old 2010-06-14 08:29:49.257421437 +0200
-+++ tc/Makefile 2010-06-14 08:30:07.157419977 +0200
-@@ -99,18 +99,11 @@
- $(AR) rcs $@ $(TCLIB)
-
- install: all
-- echo mkdir -p $(MODDESTDIR)
-- echo install -m 0755 tc $(DESTDIR)$(SBINDIR)
-- for i in $(TCSO); \
-- do echo install -m 755 $$i $(MODDESTDIR); \
-- done
-- if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
-- if [ -f $(MODDESTDIR)/m_xt.so ]; \
-- then ln -s m_xt.so $(MODDESTDIR)/m_ipt.so ; \
-- elif [ -f $(MODDESTDIR)/m_xt_old.so ]; \
-- then ln -s m_xt_old.so $(MODDESTDIR)/m_ipt.so ; \
-- fi; \
-- fi
-+ mkdir -p $(DESTDIR)$(LIBDIR)/tc
-+ install -m 0755 tc $(DESTDIR)$(SBINDIR)
-+ for i in $(TCSO); \
-+ do install -m 755 $$i $(DESTDIR)$(LIBDIR)/tc; \
-+ done
-
- clean:
- rm -f $(TCOBJ) $(TCLIB) libtc.a tc *.so emp_ematch.yacc.h; \
More information about the arch-commits
mailing list