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 D66C51382C5 for ; Sun, 20 Dec 2020 02:29:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E586AE095F; Sun, 20 Dec 2020 02:29:00 +0000 (UTC) Received: from mail-qv1-f53.google.com (mail-qv1-f53.google.com [209.85.219.53]) (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 DDC35E095F for ; Sun, 20 Dec 2020 02:29:00 +0000 (UTC) Received: by mail-qv1-f53.google.com with SMTP id u16so2951053qvl.7 for ; Sat, 19 Dec 2020 18:29:00 -0800 (PST) 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=DGe0pAbpaFiKApRJdRQtQvBkHZVXMlUzXTmsLzH5G4A=; b=A4H6xo2C6Fnn5Ti7665ldzTqGse0SJ8U4KyAZVJJm5D5BowRBKXysGznS+gr2MCF6F qyXMt+hUygdW2Jd/6iGxXxPvM8BzW6e2UxltFCxpujVAExP3ijuKc8LIs6D0Zx6iJSP/ NnmGu9Urnwe9mghU59n1VOdoVilRwcqTryUnaCn+3oU1jr4zWEuHsSYlqkaHX6IEck3I ikIKBrD+81dmmaYf7TkriujmxgvqRxb03PjAO6D/8h1zPDOiA9iJHBwYmVY8sVaG+GBy Kmb0gAec/0uoLxxtYiGjb7yIkHnXKL3ISWLhNZ8QWoL3jvMCRDO7pq65xnFYaGcfLcQX tFzQ== X-Gm-Message-State: AOAM5301SNWrnmqqjskimGkSluw17gRoyZPuip5Gz8lkaPQOEZQcjWae Ja48sZI7Lu0qQH0twtOpj0xIfmFE63Q8+w== X-Google-Smtp-Source: ABdhPJxE6ewXTF6KUMRpLPsDamjmoYvaFDPVtufSIadGmymRihnn4t2jUt65GdM5Rmvc22AG/wSxJQ== X-Received: by 2002:a0c:f005:: with SMTP id z5mr12371267qvk.9.1608431339901; Sat, 19 Dec 2020 18:28:59 -0800 (PST) Received: from localhost ([208.104.103.123]) by smtp.gmail.com with ESMTPSA id w33sm7046487qth.34.2020.12.19.18.28.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Dec 2020 18:28:59 -0800 (PST) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 5/7] targets: Pass separate arguments to run_merge() Date: Sat, 19 Dec 2020 21:28:46 -0500 Message-Id: <20201220022848.249207-5-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201220022848.249207-1-mattst88@gentoo.org> References: <20201220022848.249207-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: 5f956205-883c-4d11-b0ae-d80b4b064f66 X-Archives-Hash: 99c9b70dffc9134918d1ddd0a9851329 Signed-off-by: Matt Turner --- targets/stage1/chroot.sh | 8 ++++---- targets/stage3/chroot.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh index 6b9bfb3e..33d5c3c9 100755 --- a/targets/stage1/chroot.sh +++ b/targets/stage1/chroot.sh @@ -33,9 +33,9 @@ if [ -n "${clst_update_seed}" ]; then if [ "${clst_update_seed}" == "yes" ]; then echo "Updating seed stage..." if [ -n "${clst_update_seed_command}" ]; then - clst_root_path=/ run_merge "--buildpkg=n ${clst_update_seed_command}" + clst_root_path=/ run_merge --buildpkg=n "${clst_update_seed_command}" else - clst_root_path=/ run_merge "--update --deep --newuse --complete-graph --rebuild-if-new-ver gcc" + clst_root_path=/ run_merge --update --deep --newuse --complete-graph --rebuild-if-new-ver gcc fi elif [ "${clst_update_seed}" != "no" ]; then echo "Invalid setting for update_seed: ${clst_update_seed}" @@ -55,7 +55,7 @@ make_destpath "${clst_root_path}" ## START BUILD # First, we drop in a known-good baselayout [ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf} -run_merge "--oneshot --nodeps sys-apps/baselayout" +run_merge --oneshot --nodeps sys-apps/baselayout sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf} echo "$locales" > /etc/locale.gen @@ -76,7 +76,7 @@ if [ -e ${clst_make_conf} ]; then done fi -run_merge "--oneshot ${buildpkgs[@]}" +run_merge --oneshot "${buildpkgs[@]}" # TODO: Drop this when locale-gen in stable glibc supports ROOT. # diff --git a/targets/stage3/chroot.sh b/targets/stage3/chroot.sh index 37001db0..7dc1b6ea 100755 --- a/targets/stage3/chroot.sh +++ b/targets/stage3/chroot.sh @@ -6,7 +6,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen" echo "$locales" > /etc/locale.gen -run_merge "-e --update --deep --with-bdeps=y @system" +run_merge -e --update --deep --with-bdeps=y @system # Replace modified /etc/locale.gen with default etc-update --automode -5 -- 2.26.2