From 34106f4a1ad3956963068167861d10e34178022a Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 2 Jun 2014 12:45:22 +0000 Subject: [PATCH] include: Allow git kernel branch selection This allows the selection of a specific branch in the menuconfig when using a kernel downloaded from GIT. Signed-off-by: Mathieu Olivari SVN-Revision: 40946 --- config/Config-devel.in | 18 ++++++++++++++++++ include/kernel-defaults.mk | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/config/Config-devel.in b/config/Config-devel.in index fd57bcbccd2..09311751b42 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -62,6 +62,24 @@ menuconfig DEVEL This will create a git clone of the kernel in your build directory. + config KERNEL_GIT_LOCAL_REPOSITORY + string "Enter path to local reference repository" if DEVEL + depends on (KERNEL_GIT_CLONE_URI != "") + default "" + help + Enter a full pathname to a local reference git repository. + In this instance, the --refererence option of git clone will + be used thus creating a quick local clone of your repo. + + config KERNEL_GIT_BRANCH + string "Enter git branch to clone" if DEVEL + depends on (KERNEL_GIT_CLONE_URI != "") + default "" + help + Enter the branch name to checkout after cloning the git repository. + In this instance, the --branch option of git clone will be used. + If unused, the clone's repository HEAD will be checked-out. + config BUILD_LOG bool "Enable log files during build process" if DEVEL help diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index fd75a3f79ff..f1f5a81313d 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -38,6 +38,10 @@ ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"") KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY) endif +ifneq ($(strip $(CONFIG_KERNEL_GIT_BRANCH)),"") + KERNEL_GIT_OPTS+=--branch $(CONFIG_KERNEL_GIT_BRANCH) +endif + ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") define Kernel/Prepare/Default