[openwrt/openwrt] sdk: use git-src-full to allow Git versioning

LEDE Commits lede-commits at lists.infradead.org
Sun Nov 6 08:08:44 PST 2022


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/f795ecc0ddb40a3d796e6faaa177b545923efc70

commit f795ecc0ddb40a3d796e6faaa177b545923efc70
Author: Kuan-Yi Li <kyli at abysm.org>
AuthorDate: Sat Nov 5 00:16:36 2022 +0800

    sdk: use git-src-full to allow Git versioning
    
    $(AUTORELEASE) uses Git log to determine releases and package timestamps.
    
    Base feed is shallow cloned by default in generated SDK, resulting in
    an incomplete Git log and therefore different local package versions than
    offered upstream.
    
    This patch complements commit 7fae1e5677 by setting the base feed to use
    `src-git-full` to solve that.
    
    Signed-off-by: Kuan-Yi Li <kyli at abysm.org>
---
 target/sdk/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index be7e1ebf51..89cc898e9d 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -46,10 +46,10 @@ 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),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
+BASE_FEED:=$(if $(GIT_URL),src-git-full 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 $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
+BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git-full base $(PROJECT_GIT)/openwrt/openwrt.git$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))
 
 KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))
 KDIR_ARCHES = $(LINUX_KARCH)




More information about the lede-commits mailing list