diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2018-01-17 14:05:57 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2018-01-27 16:46:45 +0100 |
| commit | ab6a96f3f52320f834e7e4a12ec411d77bab7686 (patch) | |
| tree | 5fa82d448262e48f7baf197bebc5978e6aa5f546 | |
| parent | 285791934be0c5a3531e25a05736868b186e9843 (diff) | |
| download | upstream-ab6a96f3f52320f834e7e4a12ec411d77bab7686.tar.gz upstream-ab6a96f3f52320f834e7e4a12ec411d77bab7686.tar.bz2 upstream-ab6a96f3f52320f834e7e4a12ec411d77bab7686.zip | |
Config-devel.in: rename symbol KERNEL_GIT_BRANCH -> KERNEL_GIT_REF
The Download/git rule will do a `git checkout <git-ref>`.
So, we can use any ref we want.
No need to limit just to branches.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
| -rw-r--r-- | config/Config-devel.in | 9 | ||||
| -rw-r--r-- | include/kernel-build.mk | 6 |
2 files changed, 6 insertions, 9 deletions
diff --git a/config/Config-devel.in b/config/Config-devel.in index 30fbd6f7a9..fd7c3ead1e 100644 --- a/config/Config-devel.in +++ b/config/Config-devel.in @@ -90,13 +90,14 @@ menuconfig DEVEL In this instance, the --reference 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 + config KERNEL_GIT_REF + string "Enter git ref at which to checkout" 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. + Enter the git ref at which to checkout the git repository + after it is cloned, and before making it a tar-ball. + It can be a git hash or a branch name. If unused, the clone's repository HEAD will be checked-out. config BUILD_LOG diff --git a/include/kernel-build.mk b/include/kernel-build.mk index 5c58e443df..c3658c216a 100644 --- a/include/kernel-build.mk +++ b/include/kernel-build.mk @@ -50,14 +50,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 - define Download/git-kernel URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)) PROTO:=git - VERSION:=$(CONFIG_KERNEL_GIT_BRANCH) + VERSION:=$(CONFIG_KERNEL_GIT_REF) FILE:=$(LINUX_SOURCE) SUBDIR:=linux-$(LINUX_VERSION) OPTS:=$(KERNEL_GIT_OPTS) |