domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config-devel.in: rename symbol KERNEL_GIT_BRANCH -> KERNEL_GIT_REF

Browse Source 
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>
This commit is contained in:
Alexandru Ardelean
2018-01-17 14:05:57 +02:00
committed by Hauke Mehrtens
parent 285791934b
commit ab6a96f3f5
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/Config-devel.in
View File

@@ -90,13 +90,14 @@ menuconfig DEVEL
In this instance, the --reference option of git clone will In this instance, the --reference option of git clone will
be used thus creating a quick local clone of your repo. be used thus creating a quick local clone of your repo.
config KERNEL_GIT_BRANCH config KERNEL_GIT_REF
string "Enter git branch to clone" if DEVEL string "Enter git ref at which to checkout" if DEVEL
depends on (KERNEL_GIT_CLONE_URI != "") depends on (KERNEL_GIT_CLONE_URI != "")
default "" default ""
help help
Enter the branch name to checkout after cloning the git repository. Enter the git ref at which to checkout the git repository
In this instance, the --branch option of git clone will be used. 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. If unused, the clone's repository HEAD will be checked-out.
config BUILD_LOG config BUILD_LOG

6
include/kernel-build.mk
View File

@@ -50,14 +50,10 @@ ifneq ($(strip $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)),"")
KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY) KERNEL_GIT_OPTS+=--reference $(CONFIG_KERNEL_GIT_LOCAL_REPOSITORY)
endif endif
ifneq ($(strip $(CONFIG_KERNEL_GIT_BRANCH)),"")
KERNEL_GIT_OPTS+=--branch $(CONFIG_KERNEL_GIT_BRANCH)
endif
define Download/git-kernel define Download/git-kernel
URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)) URL:=$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI))
PROTO:=git PROTO:=git
VERSION:=$(CONFIG_KERNEL_GIT_BRANCH) VERSION:=$(CONFIG_KERNEL_GIT_REF)
FILE:=$(LINUX_SOURCE) FILE:=$(LINUX_SOURCE)
SUBDIR:=linux-$(LINUX_VERSION) SUBDIR:=linux-$(LINUX_VERSION)
OPTS:=$(KERNEL_GIT_OPTS) OPTS:=$(KERNEL_GIT_OPTS)