summaryrefslogtreecommitdiff
path: root/package/busybox
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-08-12 23:19:38 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-08-12 23:19:38 +0200
commita206070dd67744e3be5c54c80ed9dc00f55c28cb (patch)
tree24d33fbbf4e5cf88da6cfed5dd6d4f48dcf14f7b /package/busybox
parent48b4e0eac16a23713698ea4cd088cd8c857e4c33 (diff)
fix openswan
- avoid busybox IP when openswan is selected - fix crypto dependencies for esp
Diffstat (limited to 'package/busybox')
-rw-r--r--package/busybox/config/networking/Config.in2
-rw-r--r--package/busybox/patches/003-ip-config.patch18
2 files changed, 20 insertions, 0 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 3bd3e1e8f..ca92ac7f9 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -338,6 +338,7 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
bool "Use busybox ip applet"
default y
depends on BUSYBOX_FEATURE_IFUPDOWN_IP
+ depends on !ADK_PACKAGE_IP
select BUSYBOX_IP
select BUSYBOX_FEATURE_IP_ADDRESS
select BUSYBOX_FEATURE_IP_LINK
@@ -456,6 +457,7 @@ config BUSYBOX_FEATURE_INETD_RPC
config BUSYBOX_IP
bool "ip"
default y
+ depends on !ADK_PACKAGE_IP
help
The "ip" applet is a TCP/IP interface configuration and routing
utility. You generally don't need "ip" to use busybox with
diff --git a/package/busybox/patches/003-ip-config.patch b/package/busybox/patches/003-ip-config.patch
new file mode 100644
index 000000000..8c32dafe6
--- /dev/null
+++ b/package/busybox/patches/003-ip-config.patch
@@ -0,0 +1,18 @@
+diff -Nur busybox-1.13.4.orig/networking/Config.in busybox-1.13.4/networking/Config.in
+--- busybox-1.13.4.orig/networking/Config.in 2008-11-09 18:27:59.000000000 +0100
++++ busybox-1.13.4/networking/Config.in 2009-08-12 23:12:27.132893048 +0200
+@@ -338,10 +338,10 @@
+ bool "Use busybox ip applet"
+ default y
+ depends on FEATURE_IFUPDOWN_IP
+- select IP
+- select FEATURE_IP_ADDRESS
+- select FEATURE_IP_LINK
+- select FEATURE_IP_ROUTE
++ #select IP
++ #select FEATURE_IP_ADDRESS
++ #select FEATURE_IP_LINK
++ #select FEATURE_IP_ROUTE
+ help
+ Use the busybox iproute "ip" applet to implement "ifupdown".
+