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.
Taken from upstream: https://github.com/openwrt/openwrt/commit/7fae1e5677e9bb4979c8d4ac99be4de6955b13d0
Fixes: packages!942 (merged)
Merge request reports
Activity
changed milestone to %Turris OS 6.0
added High label
requested review from @mvasilek
assigned to @mvasilek
added 1 commit
- 7b5ed0cb - feeds: use git-src-full to allow Git versioning
added 1 commit
- b4e16305 - fixup! feeds: use git-src-full to allow Git versioning
marked this merge request as draft from b4e16305
added 1 commit
- f0d43565 - feeds: use git-src-full to allow Git versioning
added 1 commit
- 202db72a - feeds: use git-src-full to allow Git versioning
Steps to reproduce to have this merged as soon as possible!
- Clone Turris Build repository
- Run
./compile_pkgs prepare -t mox
You don't need tools, thus prepare is in this case ok. - Go to e.g.
build/feeds/turrispackages
- Run this command:
git log
orgit rev-list --count HEAD
Most likely, there will be one commit, if not, there will be a just a few from patches. This is wrong as git repository is grafted.
In my case:
✔ ~/work/turris1x-hbk/build/feeds/turrispackages [master ↑·1|✔] 11:56 $ git rev-list --count HEAD 2 ✔ ~/work/turris1x-hbk/build/feeds/turrispackages [master ↑·1|✔] 11:56 $ git log commit 428ab26b0e9d07c6b37ed1c2082b5010cb83fcc8 (HEAD -> master) Author: Karel Kočí <cynerd@email.cz> Date: Tue Jul 7 18:17:25 2020 +0200 Revert "mox-support: boot.scr: fix new kernel stall when on old U-Boot" This reverts commit ec495a151a5e7ae91b73b9a015724d7728ced5db. commit 8423005e66c438daa936fde059779aa817962a03 (grafted, tag: v5.3.11) Author: Josef Schlehofer <pepe.schlehofer@gmail.com> Date: Tue Jul 12 09:17:00 2022 +0200 unbound: update to version 1.16.1 Release notes: https://www.nlnetlabs.nl/news/2022/Jul/11/unbound-1.16.1-released/ ✔ ~/work/turris1x-hbk/build/feeds/turrispackages [master ↓·1↑·1|✔] 11:56 $
Nothing else.
After applying this pull request (repeat the steps mentioned above):
✔ ~/work/mox-hbl/build/feeds/turrispackages [develop|✔] 11:58 $ git rev-list --count HEAD 16459
added 4 commits
-
202db72a...0e3d179b - 3 commits from branch
hbl
- 7f064e57 - feeds: use git-src-full to allow Git versioning
-
202db72a...0e3d179b - 3 commits from branch
Submitted to OpenWrt 21.02: https://github.com/openwrt/openwrt/pull/10345