From d20e328bd5b09bd06b8bbbdee5069617a69f0fd9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 11 Dec 2016 23:36:33 +0100 Subject: rework git kernel infrastructure Module loading was broken, use stable hashes and add kernel versions to allow kernel module loading. Convert kinetis-k70 to use new infrastructure. --- mk/kernel-ver.mk | 4 ++-- mk/linux.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'mk') diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index bda689686..a13d97049 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -11,9 +11,9 @@ # KERNEL_VERSION: final kernel version how we want to identify a specific kernel ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y) -KERNEL_FILE_VER:= $(ADK_TARGET_KERNEL_GITVER) +KERNEL_FILE_VER:= $(ADK_TARGET_KERNEL_GIT) KERNEL_RELEASE:= 1 -KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) +KERNEL_VERSION:= $(ADK_TARGET_KERNEL_GIT_VER) endif ifeq ($(ADK_TARGET_KERNEL_VERSION_4_8),y) KERNEL_FILE_VER:= 4.8.11 diff --git a/mk/linux.mk b/mk/linux.mk index 47427ea95..c206906e3 100644 --- a/mk/linux.mk +++ b/mk/linux.mk @@ -4,9 +4,9 @@ PKG_NAME:= linux PKG_RELEASE:= $(KERNEL_RELEASE) ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y) -PKG_VERSION:= $(ADK_TARGET_KERNEL_GITVER) -PKG_GIT:= $(ADK_TARGET_KERNEL_GITTYPE) -PKG_SITES:= $(ADK_TARGET_KERNEL_REPO) +PKG_VERSION:= $(ADK_TARGET_KERNEL_GIT) +PKG_GIT:= $(ADK_TARGET_KERNEL_GIT_TYPE) +PKG_SITES:= $(ADK_TARGET_KERNEL_GIT_REPO) else PKG_VERSION:= $(KERNEL_FILE_VER) PKG_SITES:= ${MASTER_SITE_KERNEL:=kernel/v4.x/} \ -- cgit v1.2.3