diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-16 14:34:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-16 14:34:49 +0200 |
| commit | b2c9a66e24f94f3f9e9602baeb8925e0db5fb306 (patch) | |
| tree | 5539756a40daca29a3215376c85ef9d0797ade4c /mk | |
| parent | 998bb7ac652581d6ef3a5821aa8dcb6a3a95ecdb (diff) | |
| parent | f6dd446a3d030a424ff25e1213ab7d55abdcd86d (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 18 | ||||
| -rw-r--r-- | mk/vars.mk | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index d7383eef2..c7c81c7aa 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -777,6 +777,10 @@ $(eval $(call KMOD_template,CRYPTO_MANAGER,crypto-manager,\ $(MODULES_DIR)/kernel/crypto/chainiv \ ,07)) +$(eval $(call KMOD_template,CRYPTO_AUTHENC,crypto-authenc,\ + $(MODULES_DIR)/kernel/crypto/authenc \ +,11)) + $(eval $(call KMOD_template,CRYPTO_HMAC,crypto-hmac,\ $(MODULES_DIR)/kernel/crypto/hmac \ ,11)) @@ -813,6 +817,18 @@ $(eval $(call KMOD_template,CRYPTO_TGR192,crypto-tgr192,\ $(MODULES_DIR)/kernel/crypto/tgr192 \ ,11)) +$(eval $(call KMOD_template,CRYPTO_SEQIV,crypto-seqiv,\ + $(MODULES_DIR)/kernel/crypto/seqiv \ +,5)) + +$(eval $(call KMOD_template,CRYPTO_CTR,crypto-ctr,\ + $(MODULES_DIR)/kernel/crypto/ctr \ +,10)) + +$(eval $(call KMOD_template,CRYPTO_CCM,crypto-ccm,\ + $(MODULES_DIR)/kernel/crypto/ccm \ +,10)) + $(eval $(call KMOD_template,CRYPTO_ECB,crypto-ecb,\ $(MODULES_DIR)/kernel/crypto/ecb \ ,10)) @@ -884,6 +900,7 @@ $(eval $(call KMOD_template,CRYPTO_FCRYPT,crypto-fcrypt,\ $(eval $(call KMOD_template,CRYPTO_DEFLATE,crypto-deflate,\ $(MODULES_DIR)/kernel/lib/zlib_deflate/zlib_deflate \ + $(MODULES_DIR)/kernel/lib/zlib_inflate/zlib_inflate \ $(MODULES_DIR)/kernel/crypto/deflate \ ,10)) @@ -1066,6 +1083,7 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\ $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \ + $(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \ $(MODULES_DIR)/kernel/drivers/media/video/videodev \ ,65)) diff --git a/mk/vars.mk b/mk/vars.mk index f26e07b6a..78b37fbbe 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -127,6 +127,6 @@ QUIET:= else QUIET:= --quiet endif -FETCH_CMD?= wget -t1 --timeout=30 $(QUIET) +FETCH_CMD?= wget --tries=1 --timeout=30 $(QUIET) include $(TOPDIR)/mk/mirrors.mk |