diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-25 22:16:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-25 22:16:37 +0200 |
| commit | 82bab389a4f5e871dae68ff376fb74537b1e75b6 (patch) | |
| tree | 00bb643162853e282e04eeae6c1f06e232216027 /mk | |
| parent | f94dbc199e0abcdd3b8cc9d9d7226d8a1a6b47e1 (diff) | |
| parent | dba433e831fb3fe7ea5e6ced99c92643b8e7f9e8 (diff) | |
Merge branch 'master' of gogs.waldemar-brodkorb.de:linux/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/kernel-vars.mk | 8 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 18 |
2 files changed, 13 insertions, 13 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 17227afed..72fc56693 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -7,23 +7,23 @@ KERNEL_MAKE_OPTS:= V=1 \ CC="$(TARGET_CC)" \ HOSTCC="${HOST_CC}" \ HOSTCXX="${HOST_CXX}" \ - DISABLE_PAX_PLUGINS=y \ + SHELL='${SHELL}' \ CONFIG_SHELL='${SHELL}' # regex for relocs needs pcre ifeq ($(OS_FOR_BUILD),Darwin) -KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix' +KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix -Wl,-no_pie' endif # non-Linux platforms need elf.h ifneq ($(OS_FOR_BUILD),Linux) KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}' -KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${ADK_TOPDIR}/adk/include -DKBUILD_NO_NLS' +KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -DKBUILD_NO_NLS' else KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}' endif -ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO)$(ADK_TARGET_SYSTEM_ORANGE_PI0),y) KERNEL_MAKE_OPTS+= LOADADDR=0x40008000 endif diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 7648bf435..efb321010 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -15,17 +15,17 @@ KERNEL_FILE_VER:= $(ADK_TARGET_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif -ifeq ($(ADK_TARGET_KERNEL_VERSION_4_11),y) -KERNEL_FILE_VER:= 4.11.8 +ifeq ($(ADK_TARGET_KERNEL_VERSION_4_12),y) +KERNEL_FILE_VER:= 4.12.3 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 8e7d8dcbeb9e2c0dad15706e7f37fb8348f1cf4d72d72be13f254f533d279db8 +KERNEL_HASH:= 99bd9db1228ef60eb620071abac899d2774255bfa43d06acbdc732a17e2ebf16 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_9),y) -KERNEL_FILE_VER:= 4.9.35 +KERNEL_FILE_VER:= 4.9.38 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 3491234ed79f3e4a425457edf96447773be677521932a3e5bafb79834c5e7436 +KERNEL_HASH:= 76d789d87dd51d2fd58c095727171984fa4a992f5e25b9e3eb1e5fd5cd129074 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_6),y) KERNEL_FILE_VER:= 4.6.2 @@ -34,16 +34,16 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= e158f3c69da87c2ec28d0f194dbe18b05e0d0b9e1142566615cea3390bab1c6a endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_4),y) -KERNEL_FILE_VER:= 4.4.72 +KERNEL_FILE_VER:= 4.4.77 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 4133b41b855f58462301719d05d6d05ddb803d0117c8d57de352cb4d7835ede8 +KERNEL_HASH:= 5e7b7076c319ffc7db571a8eda9316b1b3477ca4ad0d45120fc9d40bc72ab4e8 endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_1),y) -KERNEL_FILE_VER:= 4.1.39 +KERNEL_FILE_VER:= 4.1.42 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= a8e82c8b1580ac4f8b176c714206498adedec9591eda48b895f6c61116d58854 +KERNEL_HASH:= ba1097907273b7e85dd3c6ffced346a2a2d8458893f0fc4c3fdb0d198aea04bd endif ifeq ($(ADK_TARGET_KERNEL_VERSION_3_16),y) KERNEL_FILE_VER:= 3.16.43 |