From 508ca3cda8e8204f0955fe0ebf007f66753d03a8 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sat, 7 Nov 2015 09:39:21 +0100 Subject: ptxd_make_world_install_post: copy files with '--remove-destination' Otherwise overwriting broken symlinks with files will fail. This happens occasionally in sysroot target, e.g. with /bin/pidof from busybox and initng. Signed-off-by: Michael Olbrich --- scripts/lib/ptxd_make_world_install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib') diff --git a/scripts/lib/ptxd_make_world_install.sh b/scripts/lib/ptxd_make_world_install.sh index e4db1e8fb..6d119bae0 100644 --- a/scripts/lib/ptxd_make_world_install.sh +++ b/scripts/lib/ptxd_make_world_install.sh @@ -218,7 +218,7 @@ ptxd_make_world_install_post() { # create directories first to avoid race contitions with -jeX find "${pkg_pkg_dir}" -type d -printf "%P\0" | \ xargs -0 -I{} mkdir -p "${pkg_sysroot_dir}/{}" && - cp -dprf -- "${pkg_pkg_dir}"/* "${pkg_sysroot_dir}" && + cp -dpr --remove-destination -- "${pkg_pkg_dir}"/* "${pkg_sysroot_dir}" && # host and cross packages if [ "${pkg_type}" != "target" ]; then -- cgit v1.2.3