Skip to content
Snippets Groups Projects
Verified Commit fe7fe0fe authored by Michal Vasilek's avatar Michal Vasilek
Browse files

compile_pkgs: drop useless deep clone -d option

Since 7f064e57 we do deep clones by
default, so -d (deep clone) doesn't make sense anymore
parent af0d9011
Branches
Tags
2 merge requests!569Turris OS 6.0 (HBK),!549compile_pkgs: drop useless deep clone -d option
Pipeline #103177 passed with stage
in 6 minutes and 37 seconds
......@@ -151,10 +151,7 @@ checkout() {
url="$(get_feed "#" "openwrt")"
report "Starting out: $(feed_ref "$url")"
report "Checking out OpenWRT repository"
# Note: OpenWrt's script getver.sh expects full history so we do not do deep
# copy for OpenWrt repository no matter the configuration.
CLONE_DEEP="" git_clean_checkout "openwrt" "$url" "." \
"/turris-build.conf"
git_clean_checkout "openwrt" "$url" "." "/turris-build.conf"
echo "/turris-build.conf" >> ./.gitignore
_git commit -m 'gitignore: Ignore turris-build related files' ./.gitignore
......@@ -408,9 +405,6 @@ while [ $# -gt 0 ]; do
shift
SIGN_KEY="$1"
;;
-d)
CLONE_DEEP="y"
;;
-x)
debug="y"
;;
......
......@@ -51,7 +51,6 @@ SIGN_KEY="" # Path to private signing key
FORCE="" # Force build
GIT_MIRROR="" # Path to git mirror directory
CLONE_DEEP="" # Set this variable to clone OpenWRT tree in full depth not just latest commit
DL_MIRROR="" # Path to downloads mirror directory
CCACHE_HOST_DIR="" # Path to ccache directory for host compilations
CCACHE_TARGET_DIR="" # Path to ccache directory for target compilations
......
......@@ -228,7 +228,7 @@ git_checkout() (
if use_git_mirror || feed_ref_is_branch "$url"; then
git_mirror_update "$name" "$(feed_url "$url")"
_git_mirror_lock \
git fetch ${CLONE_DEEP:+--depth 1} origin "$(feed_ref "$url")"
git fetch origin "$(feed_ref "$url")"
else
# If we are downloading directly from server we can't fetch specific
# commit so fetch everything
......
......@@ -42,7 +42,4 @@ set_target mox
# Target publish branch
#PUBLISH_BRANCH="hbs"
# Set this variable to clone OpenWRT tree in full depth not just latest commit
#CLONE_DEEP="y"
# vim: ft=sh
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment