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 75FCA1382C5 for ; Sat, 16 May 2020 06:53:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8AC63E08D0; Sat, 16 May 2020 06:53:27 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (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 841E8E08D0 for ; Sat, 16 May 2020 06:53:27 +0000 (UTC) Received: by mail-pj1-f49.google.com with SMTP id z15so4877175pjb.0 for ; Fri, 15 May 2020 23:53:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CTyXcCV6CmbmbJyHyJkm/o2J9t9DYnnMTJSVVamTd34=; b=QO9cFa8pr9gkxJPU6B/Pj8hWL3wbwWI5KhXbAcwZioFvU8Jlapj7v+KXrZVcZ5ER/a g7GYAAZYD/3lDFHeR0X7UoLlpdIjH7InTvLixykD2v4mnaD8/+zMvVzEuplDdr5lqSGI veuk5yDeUw23xq2JO1RryTMjLiM+FoWuamA/QXWvTbsX4ET75rhIJlN8GOOxl5P+HKgm gqb5emLNrjHQw2jOtXQFhvJxONOc/76xuHsnceGP72ZBD3tacH3BSnDCB9UWofSZ6DTv oIoNfLmnhfWjFtxzDh4Z5R6oFz89BcpJMXi/QKMj+khxwTyHPrTRYQd6Y8iiM7pqBKnq CayQ== X-Gm-Message-State: AOAM532pvYWOPVR5KxYkGtX0aRIoeToTkUQwIjWIxcgkn0ZX5OZABaP0 fe0g2wzwd0Dfo1GVKS4wxUJemyAV X-Google-Smtp-Source: ABdhPJysB2vO6tAIzt9QE1Dohl1sQfna13YZ17wX1bWVYPQAbPA79ksLLS0UTn92hMlOMIGCgQaL4A== X-Received: by 2002:a17:90b:601:: with SMTP id gb1mr7535957pjb.148.1589612006235; Fri, 15 May 2020 23:53:26 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id d13sm3181902pga.64.2020.05.15.23.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 23:53:25 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 2/9] targets: Make features variable local Date: Fri, 15 May 2020 23:53:10 -0700 Message-Id: <20200516065317.2678080-2-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: b2473e89-7ebd-49cc-96f2-c33bd2816739 X-Archives-Hash: b7ad63a591c6292492143cdf4a8b591d Signed-off-by: Matt Turner --- targets/stage1/chroot.sh | 2 +- targets/stage2/chroot.sh | 2 +- targets/support/chroot-functions.sh | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index a42afd19..58ed2b1d 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -9,7 +9,7 @@ export clst_buildpkgs="$(/tmp/build.py)" [ -n "${clst_BINDIST}" ] && BINDIST="bindist" BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)" -FEATURES="${features} nodoc noman noinfo -news" +FEATURES="${FEATURES} nodoc noman noinfo -news" ## Sanity check profile if [ -z "${clst_buildpkgs}" ] diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh index e472fe16..0cbaeb1d 100755 --- a/targets/stage2/chroot.sh +++ b/targets/stage2/chroot.sh @@ -3,7 +3,7 @@ source /tmp/chroot-functions.sh # Setup the environment -export FEATURES="${features} nodoc noman noinfo -news" +export FEATURES="${FEATURES} nodoc noman noinfo -news" export CONFIG_PROTECT="-* /etc/locale.gen" echo "$locales" > /etc/locale.gen diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 2eb90117..a4074d91 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -78,17 +78,17 @@ get_libdir() { setup_features() { setup_emerge_opts - export features="-news binpkg-multi-instance clean-logs parallel-install" + local features="-news binpkg-multi-instance clean-logs parallel-install" export FEATURES="${features}" if [ -n "${clst_CCACHE}" ] then - export features="${features} ccache" + features="${features} ccache" clst_root_path=/ run_merge --oneshot --noreplace dev-util/ccache || exit 1 fi if [ -n "${clst_DISTCC}" ] then - export features="${features} distcc" + features="${features} distcc" export DISTCC_HOSTS="${clst_distcc_hosts}" [ -e ${clst_make_conf} ] && \ echo 'USE="${USE} -avahi -gtk -gnome"' >> ${clst_make_conf} -- 2.26.2