summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-12 04:03:48 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-12-12 04:03:48 +0000
commitf15908485431a65bd7d9317272ef28e4b700a19d (patch)
tree83f593c3aa909d7c2097e5270d39769a809760a7
parent1203b4c004f0579bba568f1c74e10d0dd4ab55a3 (diff)
adjust svn properties: add missing "svn:keywords" for Makefiles,
set "svn:eol-style" to LF and remove "svn:keywords" for Config.in and ipkg/* files git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2638 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/aiccu/ipkg/aiccu.conffiles2
-rw-r--r--package/gsm/Makefile2
-rw-r--r--package/hostap-utils/Config.in18
-rw-r--r--package/icecast/ipkg/icecast.conffiles2
-rw-r--r--package/ipsec-tools/Makefile2
-rw-r--r--package/libvorbisidec/Makefile2
-rw-r--r--package/miredo/Makefile2
-rw-r--r--package/openntpd/ipkg/openntpd.conffiles2
-rw-r--r--package/udev/Makefile2
-rw-r--r--package/ustl/Makefile2
-rw-r--r--package/wknock/Config.in20
-rw-r--r--target/linux/Config.in2
-rw-r--r--target/linux/linux-2.4/config/brcm24
-rw-r--r--target/linux/package/spca5xx/Makefile2
14 files changed, 53 insertions, 31 deletions
diff --git a/package/aiccu/ipkg/aiccu.conffiles b/package/aiccu/ipkg/aiccu.conffiles
index 08046a23db..79c42f9984 100644
--- a/package/aiccu/ipkg/aiccu.conffiles
+++ b/package/aiccu/ipkg/aiccu.conffiles
@@ -1 +1 @@
-/etc/aiccu.conf
+/etc/aiccu.conf
diff --git a/package/gsm/Makefile b/package/gsm/Makefile
index 29490596b4..0599696d8d 100644
--- a/package/gsm/Makefile
+++ b/package/gsm/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 2567 2005-11-29 11:13:32Z nico $
+# $Id$
include $(TOPDIR)/rules.mk
diff --git a/package/hostap-utils/Config.in b/package/hostap-utils/Config.in
index 71a9f22355..d2a9f06347 100644
--- a/package/hostap-utils/Config.in
+++ b/package/hostap-utils/Config.in
@@ -1,9 +1,9 @@
-config BR2_PACKAGE_HOSTAP_UTILS
- prompt "hostap-utils...................... Host AP driver utility programs"
- tristate
- default m if CONFIG_DEVEL
- help
- Host AP driver utility programs
-
- http://hostap.epitest.fi/
-
+config BR2_PACKAGE_HOSTAP_UTILS
+ prompt "hostap-utils...................... Host AP driver utility programs"
+ tristate
+ default m if CONFIG_DEVEL
+ help
+ Host AP driver utility programs
+
+ http://hostap.epitest.fi/
+
diff --git a/package/icecast/ipkg/icecast.conffiles b/package/icecast/ipkg/icecast.conffiles
index dc0411b7c4..1203e9dc44 100644
--- a/package/icecast/ipkg/icecast.conffiles
+++ b/package/icecast/ipkg/icecast.conffiles
@@ -1 +1 @@
-/etc/icecast.xml
+/etc/icecast.xml
diff --git a/package/ipsec-tools/Makefile b/package/ipsec-tools/Makefile
index b05df8dd7c..96b3e9fd55 100644
--- a/package/ipsec-tools/Makefile
+++ b/package/ipsec-tools/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 2409 2005-11-10 08:08:12Z nico $
+# $Id$
include $(TOPDIR)/rules.mk
diff --git a/package/libvorbisidec/Makefile b/package/libvorbisidec/Makefile
index 492080b29c..4c1fc0bcbe 100644
--- a/package/libvorbisidec/Makefile
+++ b/package/libvorbisidec/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2005/10/07 17:05:47 nico Exp $
+# $Id$
include $(TOPDIR)/rules.mk
diff --git a/package/miredo/Makefile b/package/miredo/Makefile
index 1632d4f627..17c28f68f2 100644
--- a/package/miredo/Makefile
+++ b/package/miredo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 1728 2005-08-23 00:06:14Z nbd $
+# $Id$
include $(TOPDIR)/rules.mk
diff --git a/package/openntpd/ipkg/openntpd.conffiles b/package/openntpd/ipkg/openntpd.conffiles
index 51c05fac34..81306c3c97 100644
--- a/package/openntpd/ipkg/openntpd.conffiles
+++ b/package/openntpd/ipkg/openntpd.conffiles
@@ -1 +1 @@
-/etc/ntpd.conf
+/etc/ntpd.conf
diff --git a/package/udev/Makefile b/package/udev/Makefile
index 5cc807c832..34cdba6ce1 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 2567 2005-11-29 11:13:32Z nico $
+# $Id$
include $(TOPDIR)/rules.mk
diff --git a/package/ustl/Makefile b/package/ustl/Makefile
index d07c4c3b00..36b77c9583 100644
--- a/package/ustl/Makefile
+++ b/package/ustl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile 2230 2005-10-22 12:12:59Z nbd $
+# $Id$
include $(TOPDIR)/rules.mk
diff --git a/package/wknock/Config.in b/package/wknock/Config.in
index c5abe100a3..106068da3f 100644
--- a/package/wknock/Config.in
+++ b/package/wknock/Config.in
@@ -1,10 +1,10 @@
-config BR2_PACKAGE_WKNOCK
- prompt "wknock............................ A tool to hide your Access Point against opportunistic attackers."
- tristate
- default m if CONFIG_DEVEL
- select BR2_PACKAGE_LIBPCAP
- help
- A tool to hide your Access Point against opportunistic attackers.
-
- http://www.rstack.org/oudot/wknock/
-
+config BR2_PACKAGE_WKNOCK
+ prompt "wknock............................ A tool to hide your Access Point against opportunistic attackers."
+ tristate
+ default m if CONFIG_DEVEL
+ select BR2_PACKAGE_LIBPCAP
+ help
+ A tool to hide your Access Point against opportunistic attackers.
+
+ http://www.rstack.org/oudot/wknock/
+
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 0c8d38a368..7a7f7a41bc 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -489,7 +489,7 @@ config BR2_PACKAGE_KMOD_NLS_UTF8
comment "Network devices support"
config BR2_PACKAGE_KMOD_NET_3C59X
- prompt "kmod-net-3C59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
+ prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
tristate
default m
help
diff --git a/target/linux/linux-2.4/config/brcm b/target/linux/linux-2.4/config/brcm
index 5482e4617f..94a9018ec8 100644
--- a/target/linux/linux-2.4/config/brcm
+++ b/target/linux/linux-2.4/config/brcm
@@ -435,7 +435,29 @@ CONFIG_IP_NF_ARP_MANGLE=m
#
# IP: Virtual Server Configuration
#
-# CONFIG_IP_VS is not set
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
CONFIG_IPV6=m
#
diff --git a/target/linux/package/spca5xx/Makefile b/target/linux/package/spca5xx/Makefile
index d61a04a80c..cb0895703b 100644
--- a/target/linux/package/spca5xx/Makefile
+++ b/target/linux/package/spca5xx/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.2 2005/06/11 15:36:31 nbd Exp $
+# $Id$
include $(TOPDIR)/rules.mk
include ../../rules.mk