From fe7fe0fe17c382ceb5e9c97e75945f26b3194064 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Wed, 10 Aug 2022 16:58:01 +0200
Subject: [PATCH] compile_pkgs: drop useless deep clone -d option
Since 7f064e576ec6f0bde0746a9c01abf8ec3f6e2e82 we do deep clones by
default, so -d (deep clone) doesn't make sense anymore
---
compile_pkgs | 8 +-------
helpers/conf.sh | 1 -
helpers/generate_common.sh | 2 +-
turris-build.conf.example | 3 ---
4 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/compile_pkgs b/compile_pkgs
index 35f9627b9..9941465d2 100755
--- a/compile_pkgs
+++ b/compile_pkgs
@@ -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"
;;
diff --git a/helpers/conf.sh b/helpers/conf.sh
index 61767736e..0e16abb5f 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 8a5d862f1..3335b07dd 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 45c9e1410..78497960c 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
--
GitLab