Changeset 46820


Ignore:
Timestamp:
2015-09-08T14:31:04+02:00 (2 years ago)
Author:
nbd
Message:

kernel: remove packaging of kmod-crypto-core and kmod-crypto-arc4

Everything except for blkcipher was already built-in, so make blkcipher
built-in as well.

Signed-off-by: Felix Fietkau <nbd@…>

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/linux/modules/crypto.mk

    r46576 r46820  
    1616crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1)))) 
    1717 
    18 define KernelPackage/crypto-core 
    19   SUBMENU:=$(CRYPTO_MENU) 
    20   TITLE:=Core CryptoAPI modules 
    21   KCONFIG:= \ 
    22         CONFIG_CRYPTO=y \ 
    23         CONFIG_CRYPTO_HW=y \ 
    24         CONFIG_CRYPTO_BLKCIPHER \ 
    25         CONFIG_CRYPTO_ALGAPI \ 
    26         $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod))) 
    27   FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod))) 
    28 endef 
    29  
    30 $(eval $(call KernelPackage,crypto-core)) 
    31  
    32  
    3318define AddDepends/crypto 
    3419  SUBMENU:=$(CRYPTO_MENU) 
    35   DEPENDS+=+kmod-crypto-core $(1) 
     20  DEPENDS+= $(1) 
    3621endef 
    3722 
     
    254239 
    255240$(eval $(call KernelPackage,crypto-hw-omap)) 
    256  
    257  
    258 define KernelPackage/crypto-arc4 
    259   TITLE:=ARC4 (RC4) cipher CryptoAPI module 
    260   KCONFIG:=CONFIG_CRYPTO_ARC4 
    261   FILES:=$(LINUX_DIR)/crypto/arc4.ko 
    262   AUTOLOAD:=$(call AutoLoad,09,arc4) 
    263   $(call AddDepends/crypto) 
    264 endef 
    265  
    266 $(eval $(call KernelPackage,crypto-arc4)) 
    267241 
    268242 
  • trunk/package/kernel/linux/modules/fs.mk

    r46112 r46820  
    9191  $(call AddDepends/nls) 
    9292  DEPENDS+= \ 
    93     +kmod-crypto-arc4 \ 
    9493    +kmod-crypto-hmac \ 
    9594    +kmod-crypto-md5 \ 
  • trunk/package/kernel/linux/modules/netsupport.mk

    r45885 r46820  
    714714  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    715715  TITLE:=Microsoft PPP compression/encryption 
    716   DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1 +kmod-crypto-ecb 
     716  DEPENDS:=kmod-ppp +kmod-crypto-sha1 +kmod-crypto-ecb 
    717717  KCONFIG:= \ 
    718718        CONFIG_PPP_MPPE_MPPC \ 
     
    998998        $(LINUX_DIR)/net/rxrpc/rxkad.ko 
    999999  AUTOLOAD:=$(call AutoLoad,30,rxkad af-rxrpc) 
    1000   DEPENDS:=+kmod-crypto-core +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt 
     1000  DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt 
    10011001endef 
    10021002 
  • trunk/package/kernel/mac80211/Makefile

    r46708 r46820  
    7979  $(call KernelPackage/mac80211/Default) 
    8080  TITLE:=Linux 802.11 Wireless Networking Stack 
    81   DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-cfg80211 +hostapd-common 
     81  DEPENDS+= +kmod-cfg80211 +hostapd-common 
    8282  KCONFIG:=\ 
    8383        CONFIG_AVERAGE=y 
     
    720720  $(call KernelPackage/mac80211/Default) 
    721721  TITLE:=libipw for ipw2100 and ipw2200 
    722   DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN 
     722  DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN 
    723723  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko 
    724724  AUTOLOAD:=$(call AutoProbe,libipw) 
  • trunk/target/linux/generic/config-3.18

    r46501 r46820  
    701701# CONFIG_CRYPTO_ANSI_CPRNG is not set 
    702702# CONFIG_CRYPTO_ANUBIS is not set 
    703 # CONFIG_CRYPTO_ARC4 is not set 
     703CONFIG_CRYPTO_ARC4=y 
    704704# CONFIG_CRYPTO_AUTHENC is not set 
    705 # CONFIG_CRYPTO_BLKCIPHER is not set 
     705CONFIG_CRYPTO_BLKCIPHER=y 
     706CONFIG_CRYPTO_BLKCIPHER2=y 
    706707# CONFIG_CRYPTO_BLOWFISH is not set 
    707708# CONFIG_CRYPTO_CAMELLIA is not set 
  • trunk/target/linux/generic/config-4.0

    r46501 r46820  
    711711# CONFIG_CRYPTO_ANSI_CPRNG is not set 
    712712# CONFIG_CRYPTO_ANUBIS is not set 
    713 # CONFIG_CRYPTO_ARC4 is not set 
     713CONFIG_CRYPTO_ARC4=y 
    714714# CONFIG_CRYPTO_AUTHENC is not set 
    715 # CONFIG_CRYPTO_BLKCIPHER is not set 
     715CONFIG_CRYPTO_BLKCIPHER=y 
     716CONFIG_CRYPTO_BLKCIPHER2=y 
    716717# CONFIG_CRYPTO_BLOWFISH is not set 
    717718# CONFIG_CRYPTO_CAMELLIA is not set 
  • trunk/target/linux/generic/config-4.1

    r46696 r46820  
    725725# CONFIG_CRYPTO_ANSI_CPRNG is not set 
    726726# CONFIG_CRYPTO_ANUBIS is not set 
    727 # CONFIG_CRYPTO_ARC4 is not set 
     727CONFIG_CRYPTO_ARC4=y 
    728728# CONFIG_CRYPTO_AUTHENC is not set 
    729 # CONFIG_CRYPTO_BLKCIPHER is not set 
     729CONFIG_CRYPTO_BLKCIPHER=y 
     730CONFIG_CRYPTO_BLKCIPHER2=y 
    730731# CONFIG_CRYPTO_BLOWFISH is not set 
    731732# CONFIG_CRYPTO_CAMELLIA is not set 
  • trunk/target/linux/omap/config-3.18

    r45238 r46820  
    115115CONFIG_CRYPTO_AEAD=m 
    116116CONFIG_CRYPTO_AEAD2=m 
    117 CONFIG_CRYPTO_ARC4=m 
    118 CONFIG_CRYPTO_BLKCIPHER=m 
    119 CONFIG_CRYPTO_BLKCIPHER2=m 
    120117CONFIG_CRYPTO_CCM=m 
    121118CONFIG_CRYPTO_CRC32C=y 
  • trunk/target/linux/orion/config-default

    r45584 r46820  
    3838CONFIG_CPU_TLB_FEROCEON=y 
    3939CONFIG_CPU_USE_DOMAINS=y 
    40 CONFIG_CRYPTO_BLKCIPHER2=y 
    4140CONFIG_CRYPTO_DEV_MV_CESA=y 
    4241CONFIG_CRYPTO_HASH=y 
  • trunk/target/linux/sunxi/config-3.18

    r46307 r46820  
    111111CONFIG_CRC16=y 
    112112CONFIG_CRC_T10DIF=y 
    113 CONFIG_CRYPTO_ARC4=y 
    114 CONFIG_CRYPTO_BLKCIPHER=y 
    115 CONFIG_CRYPTO_BLKCIPHER2=y 
    116113CONFIG_CRYPTO_CRC32C=y 
    117114CONFIG_CRYPTO_CRCT10DIF=y 
  • trunk/target/linux/sunxi/config-4.1

    r46571 r46820  
    134134CONFIG_CRYPTO_AES_ARM=y 
    135135CONFIG_CRYPTO_AES_ARM_CE=y 
    136 CONFIG_CRYPTO_ARC4=y 
    137 CONFIG_CRYPTO_BLKCIPHER=y 
    138 CONFIG_CRYPTO_BLKCIPHER2=y 
    139136CONFIG_CRYPTO_CRC32C=y 
    140137CONFIG_CRYPTO_CRCT10DIF=y 
Note: See TracChangeset for help on using the changeset viewer.