| 1 |
commit: 5010e7702f719436b5f75dac7b9c4bf54325d98d |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 17 13:29:47 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 18 03:04:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5010e770 |
| 7 |
|
| 8 |
sys-apps/busybox: Do not overwrite existing files with make-symlinks |
| 9 |
|
| 10 |
- Turns out previous fix did not work correctly, so let's pass |
| 11 |
'echo n' to cp to stop it from overwriting existing files |
| 12 |
|
| 13 |
Fixes: 50b3efe86028e0e7d184d3a5c4a36c11f3388b6f |
| 14 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/22317 |
| 16 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 17 |
|
| 18 |
sys-apps/busybox/{busybox-1.34.0.ebuild => busybox-1.34.0-r1.ebuild} | 2 +- |
| 19 |
sys-apps/busybox/busybox-9999.ebuild | 2 +- |
| 20 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/sys-apps/busybox/busybox-1.34.0.ebuild b/sys-apps/busybox/busybox-1.34.0-r1.ebuild |
| 23 |
similarity index 99% |
| 24 |
rename from sys-apps/busybox/busybox-1.34.0.ebuild |
| 25 |
rename to sys-apps/busybox/busybox-1.34.0-r1.ebuild |
| 26 |
index 7b556bbba97..731b645a8e4 100644 |
| 27 |
--- a/sys-apps/busybox/busybox-1.34.0.ebuild |
| 28 |
+++ b/sys-apps/busybox/busybox-1.34.0-r1.ebuild |
| 29 |
@@ -337,7 +337,7 @@ pkg_postinst() { |
| 30 |
cd "${T}" || die |
| 31 |
mkdir _install |
| 32 |
tar xf busybox-links.tar -C _install || die |
| 33 |
- false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" |
| 34 |
+ echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" |
| 35 |
fi |
| 36 |
|
| 37 |
if use sep-usr ; then |
| 38 |
|
| 39 |
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild |
| 40 |
index 8297592e530..46cfa671124 100644 |
| 41 |
--- a/sys-apps/busybox/busybox-9999.ebuild |
| 42 |
+++ b/sys-apps/busybox/busybox-9999.ebuild |
| 43 |
@@ -336,7 +336,7 @@ pkg_postinst() { |
| 44 |
cd "${T}" || die |
| 45 |
mkdir _install |
| 46 |
tar xf busybox-links.tar -C _install || die |
| 47 |
- false | cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" |
| 48 |
+ echo n | cp -ivpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed" |
| 49 |
fi |
| 50 |
|
| 51 |
if use sep-usr ; then |
Archives