summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-06-02 12:45:22 +0000
committerJohn Crispin <john@openwrt.org>2014-06-02 12:45:22 +0000
commit34106f4a1ad3956963068167861d10e34178022a (patch)
tree2cf5815d94f01a68fe539159cb10c16d7de477e4
parentc77feae6be20c7c7aadaf492260dda7153f10108 (diff)
downloadmtk-20170518-34106f4a1ad3956963068167861d10e34178022a.zip
mtk-20170518-34106f4a1ad3956963068167861d10e34178022a.tar.gz
mtk-20170518-34106f4a1ad3956963068167861d10e34178022a.tar.bz2
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 <mathieu@qca.qualcomm.com> SVN-Revision: 40946
-rw-r--r--config/Config-devel.in18
-rw-r--r--include/kernel-defaults.mk4
2 files changed, 22 insertions, 0 deletions
diff --git a/config/Config-devel.in b/config/Config-devel.in
index fd57bcb..0931175 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 fd75a3f..f1f5a81 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