Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/
Date: Wed, 29 Jun 2022 16:28:17
Message-Id: 1656520085.894e06af34951af850f7a86acf427a6b3f82a5eb.sam@gentoo
1 commit: 894e06af34951af850f7a86acf427a6b3f82a5eb
2 Author: Anna Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
3 AuthorDate: Sat Jun 4 04:23:39 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 29 16:28:05 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=894e06af
7
8 scripts/bootstrap-prefix.sh: use cp from GNU coreutils
9
10 BSD cp doesn't support "-d" flag.
11
12 Signed-off-by: Anna Vyalkova <cyber+gentoo <AT> sysrq.in>
13 Closes: https://github.com/gentoo/prefix/pull/8
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 scripts/bootstrap-prefix.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
20 index 629fb6e3b3..9bcf8597f3 100755
21 --- a/scripts/bootstrap-prefix.sh
22 +++ b/scripts/bootstrap-prefix.sh
23 @@ -1647,7 +1647,7 @@ bootstrap_stage1() {
24 -e ${MAKE_CONF_DIR}/0100_bootstrap_prefix_make.conf ]] \
25 || (bootstrap_setup) || return 1
26 mkdir -p "${ROOT}"/tmp/etc/. || return 1
27 - [[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || cp -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
28 + [[ -e ${ROOT}/tmp/etc/portage/make.profile ]] || "${ROOT}"/tmp/bin/cp -dpR "${ROOT}"/etc/portage "${ROOT}"/tmp/etc || return 1
29
30 # setup portage
31 [[ -e ${ROOT}/tmp/usr/bin/emerge ]] || (bootstrap_portage) || return 1