From a052c31600ac5c5cec474969c6dc130de8f88108 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@uclibc-ng.org>
Date: Thu, 17 Nov 2016 08:01:17 +0100
Subject: git kernel handling

Simplify and allow to use git tags, branches, hashes and head.
Convert existing usage of git kernel repositories to this.
---
 mk/fetch.mk      |  3 +--
 mk/kernel-ver.mk |  8 ++------
 mk/linux.mk      | 11 ++++-------
 3 files changed, 7 insertions(+), 15 deletions(-)

(limited to 'mk')

diff --git a/mk/fetch.mk b/mk/fetch.mk
index eccdd31c0..c0698f6fa 100644
--- a/mk/fetch.mk
+++ b/mk/fetch.mk
@@ -65,13 +65,12 @@ $(1):
 	   git://*|*.git) \
 		rm -rf $${PKG_NAME}-$${PKG_VERSION}; \
 		if [ ! -z "$${PKG_GIT}" ]; then \
+		  echo "Using git ${PKG_GIT}: $${PKG_VERSION}" $(DL_TRACE); \
 		  case "$${PKG_GIT}" in \
 		    tag|branch) \
-			echo "Using git tag/branch: $${PKG_VERSION}" $(DL_TRACE); \
 			git clone --depth 1 --branch $${PKG_VERSION} $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \
 			;; \
 		    hash) \
-			echo "Using git hash: $${PKG_VERSION}" $(DL_TRACE); \
 			git clone $(GITOPTS) $${PKG_SITES} $${PKG_NAME}-$${PKG_VERSION} $(DL_TRACE); \
 			(cd $${PKG_NAME}-$${PKG_VERSION}; git checkout $(GITOPTS) $${PKG_VERSION}) $(DL_TRACE); \
 			;; \
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index ec8630393..297bdea03 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -10,12 +10,8 @@
 # KERNEL_RELEASE:  OpenADK internal versioning
 # KERNEL_VERSION:  final kernel version how we want to identify a specific kernel
 
-ifeq ($(ADK_TARGET_KERNEL_GIT),y)
-ifneq ($(ADK_TARGET_KERNEL_HASH),)
-KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_HASH)
-else
-KERNEL_FILE_VER:=	$(ADK_KERNEL_GITVER)
-endif
+ifeq ($(ADK_TARGET_KERNEL_VERSION_GIT),y)
+KERNEL_FILE_VER:=	$(ADK_TARGET_KERNEL_GITVER)
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
 endif
diff --git a/mk/linux.mk b/mk/linux.mk
index fb4e983e2..47427ea95 100644
--- a/mk/linux.mk
+++ b/mk/linux.mk
@@ -3,20 +3,17 @@
 
 PKG_NAME:=	linux
 PKG_RELEASE:=	$(KERNEL_RELEASE)
-ifeq ($(ADK_TARGET_KERNEL_GIT),y)
-ifneq ($(ADK_TARGET_KERNEL_HASH),)
-PKG_VERSION:=	$(ADK_TARGET_KERNEL_HASH)
-else
-PKG_VERSION:=	$(ADK_KERNEL_GITVER)
-endif
+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)
 else
 PKG_VERSION:=	$(KERNEL_FILE_VER)
-PKG_HASH:=	$(KERNEL_HASH)
 PKG_SITES:=  	${MASTER_SITE_KERNEL:=kernel/v4.x/} \
 		${MASTER_SITE_KERNEL:=kernel/v3.x/} \
 		${MASTER_SITE_KERNEL:=kernel/v3.0/testing/} \
 		${MASTER_SITE_KERNEL:=kernel/v4.x/testing/} \
 		${MASTER_SITE_KERNEL:=kernel/v2.6/longterm/v2.6.32/}
+PKG_HASH:=	$(KERNEL_HASH)
 DISTFILES=	$(PKG_NAME)-$(PKG_VERSION).tar.xz
 endif
-- 
cgit v1.2.3