From 4ea04101e02999ca168da3e47f7279edf2f565b7 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 11 Sep 2020 17:44:54 +0200 Subject: [PATCH] pkgdep/git: Use -R instead of -r on freebsd for cp On Linux, these two options have the same meaning, however, on FreeBSD systems -r is treated as -RL. This dereferences all the symlinks copying directly files they point at. This doesn't work very well with git since it will detect that as a type change, aborting following checkout. Use -R to make sure all special files are properly copied as well. Change-Id: Ib066896cf730b0906bcd30449f1e98a31d70ff31 Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4185 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 2c93d86f9..5e072d295 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -23,7 +23,7 @@ function install_refspdk() { output_dir="$GIT_REPOS/spdk_$(tr . _ < <(tr -d '[:alpha:]' <<< $last_release))" if [[ ! -d $output_dir ]]; then - cp -r "$GIT_REPOS/spdk_repo/spdk" "$output_dir" + cp -R "$GIT_REPOS/spdk_repo/spdk" "$output_dir" fi git -C "$output_dir" checkout "$last_release"