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 A4BB9139694 for ; Sat, 11 Mar 2017 09:35:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E25CCE0C30; Sat, 11 Mar 2017 09:35:16 +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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0EF9E0C28 for ; Sat, 11 Mar 2017 09:35:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 65BAD340F53 for ; Sat, 11 Mar 2017 09:35:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2637A6457 for ; Sat, 11 Mar 2017 09:35:14 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1489222866.7575290252aee205f76458ceea08f1e1f2a42265.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 7575290252aee205f76458ceea08f1e1f2a42265 X-VCS-Branch: pending Date: Sat, 11 Mar 2017 09:35:14 +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-Archives-Salt: addda3e0-23b1-4346-9ca8-9b7364d84de6 X-Archives-Hash: 4247b506dfe022664270344e000d1069 commit: 7575290252aee205f76458ceea08f1e1f2a42265 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Sat Mar 11 00:39:12 2017 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Mar 11 09:01:06 2017 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=75752902 Improve the order of USE definition, make sure to remove USE after building portage, add the contents of BOOTSTRAP_USE to USE and clean USE and CATALYST_USE after building pacakges. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> targets/stage1/stage1-chroot.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh index f243866..1b0aa08 100755 --- a/targets/stage1/stage1-chroot.sh +++ b/targets/stage1/stage1-chroot.sh @@ -25,7 +25,7 @@ clst_root_path=/ setup_pkgmgr "build" # We need to ensure the base stage3 has USE="bindist" # if BINDIST is set to avoid issues with openssl / openssh -[ -e ${clst_make_conf} ] && echo "USE=\"${USE} ${BINDIST}\"" >> ${clst_make_conf} +[ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf} # Update stage3 if [ -n "${clst_update_seed}" ]; then @@ -48,7 +48,7 @@ else fi # Clear USE -[ -e ${clst_make_conf} ] && sed -i -e "USE=\"s/${BINDIST}//" ${clst_make_conf} +[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"${BINDIST} ${USE}\"/d" ${clst_make_conf} make_destpath /tmp/stage1root @@ -61,7 +61,8 @@ sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} # Now, we install our packages if [ -e ${clst_make_conf} ]; then echo "CATALYST_USE=\"-* build ${BINDIST} ${clst_CATALYST_USE}\"" >> ${clst_make_conf} - echo "USE=\"\${CATALYST_USE} ${USE} \${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + echo "USE=\"\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" >> ${clst_make_conf} + for useexpand in ${clst_HOSTUSEEXPAND}; do x="clst_${useexpand}" echo "${useexpand}=\"${!x}\"" \ @@ -77,3 +78,7 @@ for useexpand in ${clst_HOSTUSEEXPAND}; do sed -i "/${useexpand}=\"${!x}\"/d" \ ${clst_make_conf} done + +# Clear USE +[ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf} +[ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE}//" ${clst_make_conf}