diff options
122 files changed, 1467 insertions, 346 deletions
diff --git a/.travis.yml b/.travis.yml index 2c3eaa7ed..7231374c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,11 @@ git: depth: 3 matrix: include: - - env: ARCH=arm SYSTEM=linksys-nslu2 + - env: ARCH=arm SYSTEM=linksys-nslu2 ENDIAN=big + - env: ARCH=arm SYSTEM=raspberry-pi + - env: ARCH=arm SYSTEM=raspberry-pi2 + - env: ARCH=arm SYSTEM=raspberry-pi3 + - env: ARCH=arm SYSTEM=beaglebone-black - env: ARCH=avr32 SYSTEM=atmel-ngw100 - env: ARCH=avr32 SYSTEM=grasshopper - env: ARCH=cris SYSTEM=foxboard-lx832 diff --git a/Makefile.adk b/Makefile.adk index df0d98d4c..663ab584a 100644 --- a/Makefile.adk +++ b/Makefile.adk @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. ADK_TOPDIR:= $(shell pwd) -GMAKE_FMK= ${MAKE} -f $(PWD)/mk/build.mk +GMAKE_FMK= ${MAKE} -f ${ADK_TOPDIR}/mk/build.mk GMAKE_INV= ${GMAKE_FMK} --no-print-directory _UNLIMIT= __limit=$$(ulimit -dH 2>/dev/null); \ 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_ |