diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-18 11:28:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-18 11:28:54 +0100 |
| commit | 648ffb1bc515c65c97b964edb0054db83840f163 (patch) | |
| tree | b414cff5bf5bf8b63f04108d8cebf815620b9298 /mk | |
| parent | f9e8a355d7ff88bae17ea9f2198fbf3f990cd1bc (diff) | |
| parent | 937802ab6844351a530711d4363fd3842a482d4b (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 | 6 | ||||
| -rw-r--r-- | mk/vars.mk | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/mk/build.mk b/mk/build.mk index d6ff9b514..c765d4e62 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -30,6 +30,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_U_BOOT=n \ ADK_PACKAGE_CRYPTINIT=n \ ADK_PACKAGE_PAM=n \ ADK_PACKAGE_VIRTINST=n \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 34c639a62..c1cf488d2 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,6 +4,12 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e endif +ifeq ($(ADK_KERNEL_VERSION_3_13_3),y) +KERNEL_VERSION:= 3.13.3 +KERNEL_MOD_VERSION:= $(KERNEL_VERSION) +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= ad98a0c623a124a25dab86406ddc7119 +endif ifeq ($(ADK_KERNEL_VERSION_3_12_6),y) KERNEL_VERSION:= 3.12.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) diff --git a/mk/vars.mk b/mk/vars.mk index 12da7c0a8..eacf12395 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -153,6 +153,7 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ GCC='$(TARGET_CC)' \ CXX='$(TARGET_CXX)' \ CROSS='$(TARGET_CROSS)' \ + CROSS_COMPILE='$(TARGET_CROSS)' \ ARCH=${ARCH} HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ |