From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DDB4138350 for ; Mon, 27 Jan 2020 02:53:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5DEE5E091B; Mon, 27 Jan 2020 02:53:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0C3AE091C for ; Mon, 27 Jan 2020 02:53:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79AEE34E39F for ; Mon, 27 Jan 2020 02:53:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3C84106 for ; Mon, 27 Jan 2020 02:53:22 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1580093584.02451cdd8614f1072096608c49ae7796a6363819.heroxbd@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 02451cdd8614f1072096608c49ae7796a6363819 X-VCS-Branch: master Date: Mon, 27 Jan 2020 02:53:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ec76fcb-4af3-4159-807d-4cc574ed98de X-Archives-Hash: 677cde481fe2bbb6294e15fe4814b76d commit: 02451cdd8614f1072096608c49ae7796a6363819 Author: Benda Xu gentoo org> AuthorDate: Mon Jan 27 02:38:20 2020 +0000 Commit: Benda XU gentoo org> CommitDate: Mon Jan 27 02:53:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=02451cdd s/bootstrap-prefix.sh: fake rsync to install linux-headers. linux-headers starts to use rsync to do the installation. Replace it with a shell script to call cp instead. Closes: https://bugs.gentoo.org/699718 Signed-off-by: Benda Xu gentoo.org> scripts/bootstrap-prefix.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 0669107fb5..3bb523071c 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1858,6 +1858,24 @@ bootstrap_stage3() { > "${ROOT}"/usr/bin/perl chmod +x "${ROOT}"/usr/bin/perl fi + + # Need rsync to for linux-headers installation + if [[ ! -x "${ROOT}"/usr/bin/rsync ]]; then + cat > "${ROOT}"/usr/bin/rsync <<-EOF + #!${ROOT}/bin/bash + while (( \$# > 0 )); do + case \$1 in + -*) shift; continue ;; + *) break ;; + esac + done + dst="\$2"/\$(basename \$1) + mkdir -p "\${dst}" + cp -rv \$1/* "\${dst}"/ + EOF + chmod +x "${ROOT}"/usr/bin/rsync + fi + # Tell dynamic loader the path of libgcc_s.so of stage2 if [[ ! -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf ]]; then mkdir -p "${ROOT}"/etc/ld.so.conf.d @@ -1877,6 +1895,8 @@ bootstrap_stage3() { with_stack_emerge_pkgs --nodeps "${pkgs[@]}" || return 1 grep -q 'apiversion=9999' "${ROOT}"/usr/bin/perl && \ rm "${ROOT}"/usr/bin/perl + grep -q 'esac' "${ROOT}"/usr/bin/rsync && \ + rm "${ROOT}"/usr/bin/rsync pkgs=( sys-devel/binutils-config