diff --git a/compile_pkgs b/compile_pkgs index 35f9627b94dd0a3a7d80489a7720843f1bf564c5..34d50e80d5f4f1e35d217a9ac374bd8d182276d1 100755 --- a/compile_pkgs +++ b/compile_pkgs @@ -153,7 +153,7 @@ checkout() { 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" "." \ + git_clean_checkout "openwrt" "$url" "." \ "/turris-build.conf" echo "/turris-build.conf" >> ./.gitignore @@ -408,9 +408,6 @@ while [ $# -gt 0 ]; do shift SIGN_KEY="$1" ;; - -d) - CLONE_DEEP="y" - ;; -x) debug="y" ;; diff --git a/helpers/conf.sh b/helpers/conf.sh index 61767736e23d95445d9ce0163c513874cb11c410..0e16abb5f9e59fc2f98181d2bef468b2100ebc71 100644 --- a/helpers/conf.sh +++ b/helpers/conf.sh @@ -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 diff --git a/helpers/generate_common.sh b/helpers/generate_common.sh index 8a5d862f103119097c018e4dfad67df227e2fcbc..3335b07dd7c232e4a71e9f0f1109773a3c4e17c6 100644 --- a/helpers/generate_common.sh +++ b/helpers/generate_common.sh @@ -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 diff --git a/turris-build.conf.example b/turris-build.conf.example index 45c9e141065b7236fbd766893c138e1e2b3a22fa..78497960c2319d7e963b11812d4446388401057e 100644 --- a/turris-build.conf.example +++ b/turris-build.conf.example @@ -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