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 931D8138239 for ; Sun, 29 Mar 2020 17:48:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF5A4E09D8; Sun, 29 Mar 2020 17:48:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 B3508E09D8 for ; Sun, 29 Mar 2020 17:48:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 DB70734F53F for ; Sun, 29 Mar 2020 17:48:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7FDBB1AA for ; Sun, 29 Mar 2020 17:48:47 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1585504101.febc83bc30a210bc14a34b671d3340a2aff8e59e.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: febc83bc30a210bc14a34b671d3340a2aff8e59e X-VCS-Branch: master Date: Sun, 29 Mar 2020 17:48:47 +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: df0be1ac-883d-495c-90f4-3297b3559bf9 X-Archives-Hash: b8a9fbfae616f804d96589229bea5e8e commit: febc83bc30a210bc14a34b671d3340a2aff8e59e Author: Matt Turner gentoo org> AuthorDate: Sun Mar 29 00:55:42 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Mar 29 17:48:21 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=febc83bc targets: Remove some dead code Signed-off-by: Matt Turner gentoo.org> targets/support/chroot-functions.sh | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 82164f64..b09a7531 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -182,17 +182,6 @@ setup_gcc(){ } setup_pkgmgr(){ - # Set bindist USE flag if clst_BINDIST is set - # this is handled independantly in stage2, changes here should be mirrored there - #if [ "${clst_target}" != "stage1" ] && [ -e "${clst_make_conf}" ] \ - # && [ -n "${clst_BINDIST}" ]; then - # if grep -q ^USE "${clst_make_conf}"; then - # echo "USE=\"\${USE} bindist\"" >> "${clst_make_conf}" - # else - # echo "USE=\"bindist\"" >> "${clst_make_conf}" - # fi - #fi - # We need to merge our package manager with USE="build" set in case it is # portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could # just let emerge @system could merge it. @@ -256,7 +245,6 @@ cleanup_stages() { esac # Remove bindist from use - # this is handled independantly in stage2, changes here should be mirrored there ${clst_sed} -i "/USE=\"\${USE} bindist\"/d" "${clst_make_conf}" ${clst_sed} -i "/USE=\"bindist\"/d" "${clst_make_conf}"