From 0bae9cf0e1182111a8afa85f0189c144e6989596 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 11 Oct 2021 10:47:00 -1000 Subject: [PATCH] feeds: use git-src-full to allow Git versioning Both $(AUTORELEASE) and $(PKG_SRC_VERSION) (from luci.git) use the Git log to determine releases and package timestamps. Feeds are shallow cloned by default, resulting in an incomplete Git log and therefore different local package versions than offered upstream. This commits sets the default feeds to use `src-git-full` to solve that. Add fixes from "2b1d92f: scripts/feeds: silence git warning by selecting pull style" to `src-git-full` Signed-off-by: Paul Spooren --- feeds.conf.default | 15 +++++++-------- scripts/feeds | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/feeds.conf.default b/feeds.conf.default index 416da4b0c..8c725e091 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,8 +1,7 @@ -src-git packages https://github.com/coolsnowwolf/packages -src-git luci https://github.com/coolsnowwolf/luci -src-git routing https://git.openwrt.org/feed/routing.git -src-git telephony https://git.openwrt.org/feed/telephony.git -#src-git video https://github.com/openwrt/video.git -#src-git targets https://github.com/openwrt/targets.git -#src-git oldpackages http://git.openwrt.org/packages.git -#src-link custom /usr/src/openwrt/custom-feed +src-git-full packages https://github.com/coolsnowwolf/packages +src-git-full luci https://github.com/coolsnowwolf/luci +src-git-full routing https://git.openwrt.org/feed/routing.git +src-git-full telephony https://git.openwrt.org/feed/telephony.git +#src-git-full video https://github.com/openwrt/video.git +#src-git-full targets https://github.com/openwrt/targets.git +#src-git-full oldpackages http://git.openwrt.org/packages.git diff --git a/scripts/feeds b/scripts/feeds index bbfd832c4..af47b150a 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -167,8 +167,8 @@ my %update_method = ( 'init' => "git clone '%s' '%s'", 'init_branch' => "git clone --branch '%s' '%s' '%s'", 'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -", - 'update' => "git pull --ff", - 'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)", + 'update' => "git pull --ff-only", + 'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)", 'post_update' => "git submodule update --init --recursive", 'controldir' => ".git", 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},