diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2017-02-19 20:45:11 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2017-02-19 20:50:24 +0100 |
| commit | f79926cb947f90d8fcbd9bec5804234566eee6b6 (patch) | |
| tree | 95451a5797ce6d6fa6f7938be029213d89b02109 /target | |
| parent | 0a26490fe4ce0f828d5d8a35ad99c05e29f3cf42 (diff) | |
| download | upstream-f79926cb947f90d8fcbd9bec5804234566eee6b6.tar.gz upstream-f79926cb947f90d8fcbd9bec5804234566eee6b6.tar.bz2 upstream-f79926cb947f90d8fcbd9bec5804234566eee6b6.zip | |
sdk: emit proper tag references for base URLs
Properly resolve symbolic tag names when constructing the base feed Git url
and avoid emitting "HEAD" references when building from detached commits.
Fixes #495, #501.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'target')
| -rw-r--r-- | target/sdk/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/target/sdk/Makefile b/target/sdk/Makefile index bec76e5ca8..54a14d352b 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -38,12 +38,14 @@ SDK_DIRS = \ $(STAGING_SUBDIR_TOOLCHAIN) GIT_URL:=$(filter git://% http://% https://%,$(shell git config --get remote.origin.url 2>/dev/null)) -GIT_BRANCH:=$(filter-out master,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) +GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null) +GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)) +GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }') -BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH))) +BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p')) BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p')) -BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base https://git.lede-project.org/source.git$(if $(GIT_BRANCH),;$(GIT_BRANCH))) +BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base https://git.lede-project.org/source.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR)) |