diff options
| author | Paul Spooren <mail@aparcar.org> | 2021-10-11 10:47:00 -1000 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-28 08:16:24 +0200 |
| commit | d445df84c5a9eb48939322733ec48031c32c2cf2 (patch) | |
| tree | 682604b50c246f37870e9876d7ce9355805a759b | |
| parent | 32101669db23a30a7ed1b84da87136802e94edf9 (diff) | |
| download | upstream-d445df84c5a9eb48939322733ec48031c32c2cf2.tar.gz upstream-d445df84c5a9eb48939322733ec48031c32c2cf2.tar.bz2 upstream-d445df84c5a9eb48939322733ec48031c32c2cf2.zip | |
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 <mail@aparcar.org>
(cherry picked from commit 7fae1e5677e9bb4979c8d4ac99be4de6955b13d0)
| -rw-r--r-- | feeds.conf.default | 8 | ||||
| -rwxr-xr-x | scripts/feeds | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 98bf97232d..f1827a3661 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,5 +1,5 @@ -src-git packages https://git.openwrt.org/feed/packages.git;openwrt-21.02 -src-git luci https://git.openwrt.org/project/luci.git;openwrt-21.02 -src-git routing https://git.openwrt.org/feed/routing.git;openwrt-21.02 -src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02 +src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-21.02 +src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-21.02 +src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-21.02 +src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-21.02 #src-link custom /usr/src/openwrt/custom-feed diff --git a/scripts/feeds b/scripts/feeds index eee0a50717..499354391b 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'"}, |