From d99d23d0ae5887c6f99a6dbb3617d26b71242743 Mon Sep 17 00:00:00 2001 From: lean Date: Wed, 16 Feb 2022 13:47:04 +0800 Subject: [PATCH] Revert "feeds: use git-src-full to allow Git versioning" This reverts commit 0bae9cf0e1182111a8afa85f0189c144e6989596. --- feeds.conf.default | 15 ++++++++------- scripts/feeds | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/feeds.conf.default b/feeds.conf.default index 8c725e091..416da4b0c 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,7 +1,8 @@ -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 +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 diff --git a/scripts/feeds b/scripts/feeds index af47b150a..bbfd832c4 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-only", - 'update_force' => "git pull --ff-only || (git reset --hard HEAD; git pull --ff-only; exit 1)", + 'update' => "git pull --ff", + 'update_force' => "git pull --ff || (git reset --hard HEAD; git pull --ff; exit 1)", 'post_update' => "git submodule update --init --recursive", 'controldir' => ".git", 'revision' => "git rev-parse --short HEAD | tr -d '\n'"},