ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 07:46:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

feeds: use git-src-full to allow Git versioning

Browse Source 
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 <mail@aparcar.org>
This commit is contained in:
Paul Spooren 2021-10-11 10:47:00 -10:00
parent 2120cad38d
commit 7fae1e5677
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
feeds.conf.default
View File

@ -1,8 +1,8 @@
src-git packages https://git.openwrt.org/feed/packages.git src-git-full packages https://git.openwrt.org/feed/packages.git
src-git luci https://git.openwrt.org/project/luci.git src-git-full luci https://git.openwrt.org/project/luci.git
src-git routing https://git.openwrt.org/feed/routing.git src-git-full routing https://git.openwrt.org/feed/routing.git
src-git telephony https://git.openwrt.org/feed/telephony.git src-git-full telephony https://git.openwrt.org/feed/telephony.git
#src-git video https://github.com/openwrt/video.git #src-git-full video https://github.com/openwrt/video.git
#src-git targets https://github.com/openwrt/targets.git #src-git-full targets https://github.com/openwrt/targets.git
#src-git oldpackages http://git.openwrt.org/packages.git #src-git-full oldpackages http://git.openwrt.org/packages.git
#src-link custom /usr/src/openwrt/custom-feed #src-link custom /usr/src/openwrt/custom-feed

4
scripts/feeds
View File

@ -167,8 +167,8 @@ my %update_method = (
'init' => "git clone '%s' '%s'", 'init' => "git clone '%s' '%s'",
'init_branch' => "git clone --branch '%s' '%s' '%s'", 'init_branch' => "git clone --branch '%s' '%s' '%s'",
'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -", 'init_commit' => "git clone '%s' '%s' && cd '%s' && git checkout -b '%s' '%s' && cd -",
'update' => "git pull --ff", 'update' => "git pull --ff-only",
'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)", 'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)",
'post_update' => "git submodule update --init --recursive", 'post_update' => "git submodule update --init --recursive",
'controldir' => ".git", 'controldir' => ".git",
'revision' => "git rev-parse --short HEAD | tr -d '\n'"}, 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},