[source] sdk: emit proper tag references for base URLs

LEDE Commits lede-commits at lists.infradead.org
Sun Feb 19 11:53:26 PST 2017


jow pushed a commit to source.git, branch lede-17.01:
https://git.lede-project.org/f79926cb947f90d8fcbd9bec5804234566eee6b6

commit f79926cb947f90d8fcbd9bec5804234566eee6b6
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Sun Feb 19 20:45:11 2017 +0100

    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 at mein.io>
---
 target/sdk/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index bec76e5..54a14d3 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))
 



More information about the lede-commits mailing list