diff --git a/compile_pkgs b/compile_pkgs index d790f5ff4753ffa28b9495da6fad94f644ec987b..35f9627b94dd0a3a7d80489a7720843f1bf564c5 100755 --- a/compile_pkgs +++ b/compile_pkgs @@ -194,7 +194,7 @@ set_local_feeds() { use_git_mirror || return 0 report "Setting feeds to their local counterparts" while read -r vcs name url rest; do - if [ "$vcs" = src-git ]; then + if [ "$vcs" = src-git-full ]; then git_mirror_update "$name" "$(feed_url "$url")" url="$(git_mirror_url "$name" "$url")" fi @@ -247,7 +247,7 @@ repatch_feeds() { report "Patching feeds" while read -r vcs name url rest; do - if [ "$vcs" = src-git ]; then + if [ "$vcs" = src-git-full ]; then patch_repository "$name" "$build_dir/feeds/$name" fi done < feeds.conf diff --git a/feeds.conf b/feeds.conf index c1803ddb8d1271657d69742e17d03d2aa5dae2e0..9cbed66e431b892c583ce3b23fb525c0790371b4 100644 --- a/feeds.conf +++ b/feeds.conf @@ -2,13 +2,13 @@ ## It is commented out because it is not feed but is used by compile_pkgs script. # openwrt https://git.openwrt.org/openwrt/openwrt.git;openwrt-21.02 -src-git turrispackages https://gitlab.nic.cz/turris/os/packages.git;develop -src-git node https://github.com/nxhack/openwrt-node-packages.git;openwrt-21.02 -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 cesnet https://github.com/CESNET/Nemea-OpenWRT.git +src-git-full turrispackages https://gitlab.nic.cz/turris/os/packages.git;develop +src-git-full node https://github.com/nxhack/openwrt-node-packages.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-git-full cesnet https://github.com/CESNET/Nemea-OpenWRT.git ## Following line is not feed but it is used in generate_lists script. # updater-lists https://gitlab.nic.cz/turris/os/updater-lists.git;develop diff --git a/helpers/generate_common.sh b/helpers/generate_common.sh index 30571c001180deaa7bc75faf69a5c664ee2e3a29..8a5d862f103119097c018e4dfad67df227e2fcbc 100644 --- a/helpers/generate_common.sh +++ b/helpers/generate_common.sh @@ -51,7 +51,7 @@ set_protected_build_dir() { } # Helper function to locate specific line in feeds.conf -# First argument is feed's VCS. That is in general "src-git" for real feeds or +# First argument is feed's VCS. That is in general "src-git-full" for real feeds or # "#" for non-feed repositories. # Second argument is feed's name. # Echoes URL as stored in feeds.conf file