kernel: make ISDN build again

In combination with r20339 ISDN will be build again.

 * Fix syntax problem in kmod-capi
 * add xfrm_ipcomp to kmod-ipsec

SVN-Revision: 20341
This commit is contained in:
Hauke Mehrtens 2010-03-21 14:05:59 +00:00
parent dfff03754d
commit 94e9763799

View File

@ -88,11 +88,12 @@ define KernelPackage/capi
KCONFIG:= \ KCONFIG:= \
CONFIG_ISDN_CAPI \ CONFIG_ISDN_CAPI \
CONFIG_ISDN_CAPI_CAPI20 \ CONFIG_ISDN_CAPI_CAPI20 \
CONFIG_ISDN_CAPIFS CONFIG_ISDN_CAPIFS \
CONFIG_ISDN_CAPI_CAPIFS
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/isdn/capi/kernelcapi.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/isdn/capi/capifs.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/isdn/capi/capi.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi) AUTOLOAD:=$(call AutoLoad,30,kernelcapi capifs capi)
endef endef
@ -108,19 +109,7 @@ define KernelPackage/misdn
KCONFIG:= \ KCONFIG:= \
CONFIG_MISDN \ CONFIG_MISDN \
CONFIG_MISDN_DSP \ CONFIG_MISDN_DSP \
CONFIG_MISDN_L1OIP \ CONFIG_MISDN_L1OIP
CONFIG_ISDN_AUDIO=n \
CONFIG_ISDN_WITH_ABC=n \
CONFIG_ISDN_DRV_LOOP=n \
CONFIG_ISDN_DIVERSION=n \
CONFIG_ISDN_DRV_HISAX=n \
CONFIG_ISDN_DRV_ICN=n \
CONFIG_ISDN_DRV_PCBIT=n \
CONFIG_ISDN_DRV_SC=n \
CONFIG_ISDN_DRV_ACT2000=n \
CONFIG_ISDN_DRV_EICON=n \
CONFIG_ISDN_DRV_TPAM=n \
CONFIG_HYSDN=n
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_core.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/drivers/isdn/mISDN/mISDN_dsp.$(LINUX_KMOD_SUFFIX) \
@ -155,19 +144,12 @@ define KernelPackage/isdn4linux
CONFIG_ISDN_MPP=y \ CONFIG_ISDN_MPP=y \
CONFIG_IPPP_FILTER=y \ CONFIG_IPPP_FILTER=y \
CONFIG_ISDN_PPP_BSDCOMP \ CONFIG_ISDN_PPP_BSDCOMP \
CONFIG_ISDN_CAPI_MIDDLEWARE=y \
CONFIG_ISDN_CAPI_CAPIFS_BOOL=y \
CONFIG_ISDN_AUDIO=y \ CONFIG_ISDN_AUDIO=y \
CONFIG_ISDN_TTY_FAX=y \ CONFIG_ISDN_TTY_FAX=y \
CONFIG_ISDN_X25=y \ CONFIG_ISDN_X25=y \
CONFIG_ISDN_DIVERSION \ CONFIG_ISDN_DIVERSION
CONFIG_ISDN_CAPI_CAPIDRV=n \
CONFIG_ISDN_DRV_ACT2000=n \
CONFIG_ISDN_DRV_GIGASET=n \
CONFIG_ISDN_DRV_HISAX=n \
CONFIG_ISDN_DRV_ICN=n \
CONFIG_ISDN_DRV_LOOP=n \
CONFIG_ISDN_DRV_PCBIT=n \
CONFIG_ISDN_DRV_SC=n \
CONFIG_HYSDN=n
FILES:= \ FILES:= \
$(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/isdn/divert/dss1_divert.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert) AUTOLOAD:=$(call AutoLoad,40,isdn isdn_bsdcomp dss1_divert)
@ -217,10 +199,12 @@ define KernelPackage/ipsec
DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1 DEPENDS:=@LINUX_2_6 +kmod-crypto-core +kmod-crypto-des +kmod-crypto-hmac +kmod-crypto-md5 +kmod-crypto-sha1
KCONFIG:= \ KCONFIG:= \
CONFIG_NET_KEY \ CONFIG_NET_KEY \
CONFIG_XFRM_USER CONFIG_XFRM_USER \
CONFIG_XFRM_IPCOMP
FILES:= \ FILES:= \
$(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \ $(LINUX_DIR)/net/key/af_key.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/net/xfrm/xfrm_user.$(LINUX_KMOD_SUFFIX) \
$(LINUX_DIR)/net/xfrm/xfrm_ipcomp.$(LINUX_KMOD_SUFFIX)
endef endef
define KernelPackage/ipsec/description define KernelPackage/ipsec/description