Browse Source

fix openswan

- avoid busybox IP when openswan is selected
- fix crypto dependencies for esp
Waldemar Brodkorb 16 years ago
parent
commit
a206070dd6

+ 2 - 2
mk/build.mk

@@ -33,8 +33,8 @@ POSTCONFIG=		-@\
 	done; \
 	fi; \
 	if [ "$$(grep ^BUSYBOX .config|md5sum)" != "$$(grep ^BUSYBOX .config.old|md5sum)" ];then \
-		if [ -f build_$(CPU_ARCH)/w-busybox*/busybox*/.configure_done ];then \
-			rm build_$(CPU_ARCH)/w-busybox*/busybox*/.configure_done; \
+		if [ -f build_*/w-busybox*/busybox*/.configure_done ];then \
+			rm build_*/w-busybox*/busybox*/.configure_done; \
 		fi; \
 	fi; \
 	fi

+ 2 - 0
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

+ 18 - 0
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".
+ 

+ 1 - 0
target/linux/config/Config.in.crypto

@@ -106,6 +106,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_AEAD
 	tristate
 	default n
 	select ADK_KERNEL_CRYPTO
+	select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
 	help
 
 config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER