diff options
| -rw-r--r-- | patches/iproute2-2.6.23/generic/iproute2-2.6.23-arpd-against-db44.diff | 17 | ||||
| -rw-r--r-- | patches/iproute2-2.6.23/generic/series | 1 | ||||
| -rw-r--r-- | rules/apache2.in | 2 | ||||
| -rw-r--r-- | rules/iproute2.in | 47 | ||||
| -rw-r--r-- | rules/iproute2.make | 40 |
5 files changed, 68 insertions, 39 deletions
diff --git a/patches/iproute2-2.6.23/generic/iproute2-2.6.23-arpd-against-db44.diff b/patches/iproute2-2.6.23/generic/iproute2-2.6.23-arpd-against-db44.diff deleted file mode 100644 index afd55a9b4..000000000 --- a/patches/iproute2-2.6.23/generic/iproute2-2.6.23-arpd-against-db44.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - misc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: misc/Makefile -=================================================================== ---- misc/Makefile.orig -+++ misc/Makefile -@@ -19,7 +19,7 @@ rtacct: rtacct.c - $(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm - - arpd: arpd.c -- $(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb -lpthread -+ $(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb-4.4 -lpthread - - ssfilter.c: ssfilter.y - bison ssfilter.y -o ssfilter.c diff --git a/patches/iproute2-2.6.23/generic/series b/patches/iproute2-2.6.23/generic/series deleted file mode 100644 index 023bbc0a4..000000000 --- a/patches/iproute2-2.6.23/generic/series +++ /dev/null @@ -1 +0,0 @@ -iproute2-2.6.23-arpd-against-db44.diff -p0 diff --git a/rules/apache2.in b/rules/apache2.in index 76dbbd9bd..463e9f158 100644 --- a/rules/apache2.in +++ b/rules/apache2.in @@ -74,7 +74,7 @@ config APACHE2_INSTALL_CONFIG prompt "User defined" help This uses a user defined httpd.conf file. - PTXdist uses file projectroot/httpd.conf in your + PTXdist uses file projectroot/etc/apache2/httpd.conf in your local project endchoice diff --git a/rules/iproute2.in b/rules/iproute2.in index e4c8c08ae..b8fa7a194 100644 --- a/rules/iproute2.in +++ b/rules/iproute2.in @@ -1,17 +1,50 @@ ## SECTION=networking -config IPROUTE2 +menuconfig IPROUTE2 tristate prompt "iproute2" - select DB + select DB if IPROUTE2_ARPD select LIBC_DL select LIBC_M select LIBC_RESOLV - # arpd.c:(.text+0x1428): undefined reference to `__db185_open' -# depends on BROKEN help - Iproute2 is a collection of utilities for - controlling TCP/IP networking and traffic - control in Linux. + Iproute2 is a collection of utilities for controlling TCP/IP networking + apnd traffic control in Linux. +if IPROUTE2 + +config IPROUTE2_IP + bool + prompt "ip" + +config IPROUTE2_RTMON + bool + prompt "rtmon" + +config IPROUTE2_TC + bool + prompt "tc" + +config IPROUTE2_ARPD + bool + select DB_44 + prompt "arpd" + +config IPROUTE2_LNSTAT + bool + prompt "lnstat" + +config IPROUTE2_NSTAT + bool + prompt "nstat" + +config IPROUTE2_RTACCT + bool + prompt "rtacct" + +config IPROUTE2_SS + bool + prompt "ss" + +endif diff --git a/rules/iproute2.make b/rules/iproute2.make index 4fc7f5fca..64d9bf023 100644 --- a/rules/iproute2.make +++ b/rules/iproute2.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 # # Paths and names # -IPROUTE2_VERSION := 2.6.23 +IPROUTE2_VERSION := 2.6.29-1 IPROUTE2 := iproute2-$(IPROUTE2_VERSION) IPROUTE2_SUFFIX := tar.bz2 IPROUTE2_URL := http://developer.osdl.org/dev/iproute2/download/$(IPROUTE2).$(IPROUTE2_SUFFIX) @@ -111,43 +111,57 @@ $(STATEDIR)/iproute2.targetinstall: $(iproute2_targetinstall_deps_default) @$(call install_fixup,iproute2,DEPENDS,) @$(call install_fixup,iproute2,DESCRIPTION,missing) +ifdef PTXCONF_IPROUTE2_IP @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/ip/ip, \ /sbin/ip ) +endif +ifdef PTXCONF_IPROUTE2_RTMON @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/ip/rtmon, \ /sbin/rtmon) +endif +ifdef PTXCONF_IPROUTE2_TC @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/tc/tc, \ /sbin/tc) + @$(call install_copy, iproute2, 0, 0, 0755, \ + $(IPROUTE2_DIR)/netem/normal.dist, \ + /usr/lib/tc/normal.dist,n) @$(call install_copy, iproute2, 0, 0, 0755, \ + $(IPROUTE2_DIR)/netem/pareto.dist, \ + /usr/lib/tc/pareto.dist,n) + + @$(call install_copy, iproute2, 0, 0, 0755, \ + $(IPROUTE2_DIR)/netem/paretonormal.dist, \ + /usr/lib/tc/paretonormal.dist,n) +endif +ifdef PTXCONF_IPROUTE2_ARPD + @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/misc/arpd, \ /usr/sbin/arpd ) +endif +ifdef PTXCONF_IPROUTE2_LNSTAT @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/misc/lnstat, \ /usr/sbin/lnstat ) +endif +ifdef PTXCONF_IPROUTE2_NSTAT @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/misc/nstat, \ /usr/sbin/nstat ) +endif +ifdef PTXCONF_IPROUTE2_RTACCT @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/misc/rtacct, \ /usr/sbin/rtacct ) +endif +ifdef PTXCONF_IPROUTE2_SS @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/misc/ss, \ /usr/sbin/ss ) - - @$(call install_copy, iproute2, 0, 0, 0755, \ - $(IPROUTE2_DIR)/netem/normal.dist, \ - /usr/lib/tc/normal.dist,n) - - @$(call install_copy, iproute2, 0, 0, 0755, \ - $(IPROUTE2_DIR)/netem/pareto.dist, \ - /usr/lib/tc/pareto.dist,n) - - @$(call install_copy, iproute2, 0, 0, 0755, \ - $(IPROUTE2_DIR)/netem/paretonormal.dist, \ - /usr/lib/tc/paretonormal.dist,n) +endif @$(call install_copy, iproute2, 0, 0, 0755, \ $(IPROUTE2_DIR)/etc/iproute2/ematch_map, \ |