gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 17:09:10 -07:00
Code Issues Projects Releases Wiki Activity

sys-apps/busybox: Do not overwrite existing files with make-symlinks

Browse Source 
- Turns out previous fix did not work correctly, so let's pass
  'echo n' to cp to stop it from overwriting existing files

Fixes: 50b3efe860
Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22317
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Jakov Smolić
2021-09-17 15:29:47 +02:00
committed by Sam James
parent 37f0234430
commit 5010e7702f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sys-apps/busybox/busybox-1.34.0.ebuild → sys-apps/busybox/busybox-1.34.0-r1.ebuild
View File

@@ -337,7 +337,7 @@ pkg_postinst() {
cd "${T}" || die
mkdir _install
tar xf busybox-links.tar -C _install || die
false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
fi
if use sep-usr ; then

2
sys-apps/busybox/busybox-9999.ebuild
View File

@@ -336,7 +336,7 @@ pkg_postinst() {
cd "${T}" || die
mkdir _install
tar xf busybox-links.tar -C _install || die
false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
fi
if use sep-usr ; then