Revision: 5730
http://ipcop.svn.sourceforge.net/ipcop/?rev=5730&view=rev
Author: gespinasse
Date: 2011-07-09 19:41:54 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Upgrade iproute2 to 2.6.39
Enhance lfs/iproute2 so we could still build the exactly same package, even
after linux-atm and iptables have been build
Clean the variables not needed on make
Remove from rootfile the duplicate tc/*.dist on lib and usr/lib
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/iproute2
ipcop/trunk/lfs/iproute2
ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
ipcop/trunk/updates/1.9.20/information.xml
Modified: ipcop/trunk/config/rootfiles/common/iproute2
===================================================================
--- ipcop/trunk/config/rootfiles/common/iproute2 2011-07-09 18:58:56 UTC
(rev 5729)
+++ ipcop/trunk/config/rootfiles/common/iproute2 2011-07-09 19:41:54 UTC
(rev 5730)
@@ -1,17 +1,12 @@
-## iproute2-2.6.35
-##
#etc/iproute2
#etc/iproute2/ematch_map
+#etc/iproute2/group
#etc/iproute2/rt_dsfield
#etc/iproute2/rt_protos
#etc/iproute2/rt_realms
#etc/iproute2/rt_scopes
#etc/iproute2/rt_tables
#lib/tc
-#lib/tc/experimental.dist
-#lib/tc/normal.dist
-#lib/tc/pareto.dist
-#lib/tc/paretonormal.dist
#sbin/ctstat
#sbin/genl
#sbin/ifcfg
Modified: ipcop/trunk/lfs/iproute2
===================================================================
--- ipcop/trunk/lfs/iproute2 2011-07-09 18:58:56 UTC (rev 5729)
+++ ipcop/trunk/lfs/iproute2 2011-07-09 19:41:54 UTC (rev 5730)
@@ -33,12 +33,12 @@
include Config
PKG_NAME = iproute2
-VER = 2.6.38
+VER = 2.6.39
HOST_ARCH = all
OTHER_SRC = yes
THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = http://developer.osdl.org/dev/iproute2/download
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
@@ -50,7 +50,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a243bfea837e71824b7ca26c3bb45fa8
+$(DL_FILE)_MD5 = 8a3b6bc77c2ecf752284aa4a6fc630a6
install : $(TARGET)
@@ -79,12 +79,16 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- # @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- @rm -rf $(DIR_APP) /usr/share/man/man8/tc-bfifo.8 && cd $(DIR_SRC) &&
tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
+ # Let us be able to rebuild this package the same, even after linux-atm
and iptables were build
+ # First, we compile linux-atm after iproute2 and it is doubtfull atm
support for tc is needed
+ # Secondly, if iptables is already installed, TC_CONFIG_XT is set to y,
m_xt.so is added to compilation and fail actually to compile
+ cd $(DIR_APP) && echo -e "TC_CONFIG_ATM:=n\nTC_CONFIG_XT:=n" >Config
+
cd $(DIR_APP) && sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
- cd $(DIR_APP) && make -j $(PARALLELISM) DESTDIR= LIBDIR=/usr/lib
DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man
- cd $(DIR_APP) && make DESTDIR= LIBDIR=/usr/lib
DOCDIR=/usr/share/doc/iproute2 MANDIR=/usr/share/man install
+ cd $(DIR_APP) && make -j $(PARALLELISM) DESTDIR=
+ cd $(DIR_APP) && make DESTDIR= DOCDIR=/usr/share/doc/iproute2
MANDIR=/usr/share/man install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-09 18:58:56 UTC
(rev 5729)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-09 19:41:54 UTC
(rev 5730)
@@ -220,6 +220,12 @@
/sbin/iptables
/sbin/xtables-multi
##
+## iproute2-2.6.39
+/sbin/ip
+/sbin/rtmon
+/sbin/ss
+/sbin/tc
+##
## iptstate-2.2.3
/usr/sbin/iptstate
##
Modified: ipcop/trunk/updates/1.9.20/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.20/information.xml 2011-07-09 18:58:56 UTC (rev
5729)
+++ ipcop/trunk/updates/1.9.20/information.xml 2011-07-09 19:41:54 UTC (rev
5730)
@@ -6,7 +6,7 @@
<description>Language updates.<br />
Upgrade acpid to 2.0.9, apache httpd to 2.2.19, bash to 4.2.10, bind
to 9.7.3-P1, coreutils to 8.12,
dejavu-fonts to 2.33, dhcpcd to 5.2.12, grep to 2.8,
- hdparm to 9.37, iptables to 1.4.11.1, iptstate to 2.2.3, iw to 0.9.22,
kernel to 2.6.32.42,
+ hdparm to 9.37, iproute2 to 2.6.39, iptables to 1.4.11.1, iptstate to
2.2.3, iw to 0.9.22, kernel to 2.6.32.42,
less to 444, libnet to 1.1.5, libcap to 2.21, linux-atm-2.5.2 patched,
mdadm to 3.1.5, openssh to 5.8p2, openswan to 2.6.34, openvpn to 2.2.0,
pango to 1.28.4, pcmciautils to 018, procps-3.2.8 patched,
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
