diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-07 09:39:21 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-11-07 09:44:29 +0100 |
commit | 508ca3cda8e8204f0955fe0ebf007f66753d03a8 (patch) | |
tree | 69cee1e9678759aade9330dd99959c9502e74b52 /scripts/lib | |
parent | c3ca4a4442ad63c2ccc6198a273693bec1283680 (diff) | |
download | ptxdist-508ca3cda8e8204f0955fe0ebf007f66753d03a8.tar.gz ptxdist-508ca3cda8e8204f0955fe0ebf007f66753d03a8.tar.xz |
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 <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/ptxd_make_world_install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |