diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-09 14:50:40 +0000 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-07-09 14:50:40 +0000 |
| commit | a61beceb0d5a3bda0301904c8807d12a85529281 (patch) | |
| tree | a93ad7f1752de76c55a7c152b7c4e9754cebfdca /mk | |
| parent | 23c858c8d403289b762fdf26a77c79b583ec78de (diff) | |
| parent | d177f917f8a999e94a96a4b07372d7488166a2c3 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 16 | ||||
| -rw-r--r-- | mk/modules.mk | 14 |
3 files changed, 16 insertions, 15 deletions
diff --git a/mk/build.mk b/mk/build.mk index fa2e21fd5..ffafca786 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -47,6 +47,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_URLGRABBER=n \ ADK_PACKAGE_PERL=n \ ADK_PKG_LAPTOP=n \ + ADK_PKG_MPDBOX=n \ ADK_PKG_DEVELOPMENT=n \ ADK_PKG_VPN_CLIENT=n \ ADK_PKG_VPN_SERVER=n \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index a7932a76e..57e971817 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -1,18 +1,18 @@ ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y) -KERNEL_VERSION:= 3.8.10 +KERNEL_VERSION:= 3.9.8 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 3d5fb6d9add9cce7725bbe9b139c8d6e +KERNEL_MD5SUM:= 04d74575ef1c484ad00be61f32bb4557 endif -ifeq ($(ADK_KERNEL_VERSION_3_8_10),y) -KERNEL_VERSION:= 3.8.10 +ifeq ($(ADK_KERNEL_VERSION_3_9_8),y) +KERNEL_VERSION:= 3.9.8 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 3d5fb6d9add9cce7725bbe9b139c8d6e +KERNEL_MD5SUM:= 04d74575ef1c484ad00be61f32bb4557 endif -ifeq ($(ADK_KERNEL_VERSION_3_4_42),y) -KERNEL_VERSION:= 3.4.42 +ifeq ($(ADK_KERNEL_VERSION_3_4_51),y) +KERNEL_VERSION:= 3.4.51 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 -KERNEL_MD5SUM:= 1d802f8c5b881186d74e087aced2d553 +KERNEL_MD5SUM:= f028dc67e2e8a782debc3207d47b33a0 endif diff --git a/mk/modules.mk b/mk/modules.mk index 3a0466061..4e247d98d 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -994,10 +994,10 @@ $(eval $(call KMOD_template,CRYPTO_MICHAEL_MIC,crypto-michael-mic,\ $(MODULES_DIR)/kernel/crypto/michael_mic \ ,11)) -$(eval $(call KMOD_template,CRYPTO_CRC32C,crypto-crc32c,\ - $(MODULES_DIR)/kernel/lib/libcrc32c \ - $(MODULES_DIR)/kernel/crypto/crc32c \ -,11)) +#$(eval $(call KMOD_template,CRYPTO_CRC32C,crypto-crc32c,\ +# $(MODULES_DIR)/kernel/lib/libcrc32c \ +# $(MODULES_DIR)/kernel/crypto/crc32c \ +#,11)) $(eval $(call KMOD_template,OCF_CRYPTOSOFT,ocf-cryptosoft,\ ${MODULES_DIR}/kernel/crypto/ocf/cryptosoft \ @@ -1658,9 +1658,9 @@ $(eval $(call KMOD_template,CRC32,crc32, \ $(MODULES_DIR)/kernel/lib/crc32 \ ,01)) -$(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \ - $(MODULES_DIR)/kernel/lib/libcrc32c \ -,10)) +#$(eval $(call KMOD_template,LIBCRC32C,libcrc32c, \ +# $(MODULES_DIR)/kernel/lib/libcrc32c \ +#,10)) # # parallel port support |