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 BD1DE1382C5 for ; Sat, 19 Dec 2020 19:56:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD4812BC024; Sat, 19 Dec 2020 19:56:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 B2A322BC024 for ; Sat, 19 Dec 2020 19:56:07 +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 D2C71341035 for ; Sat, 19 Dec 2020 19:56:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5A869474 for ; Sat, 19 Dec 2020 19:56:03 +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: <1608346612.f229afe0e328d8d89df72097e316dadcec40aa7b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:wip/mattst88 commit in: targets/stage1/, targets/stage3/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh targets/stage3/chroot.sh X-VCS-Directories: targets/stage3/ targets/stage1/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f229afe0e328d8d89df72097e316dadcec40aa7b X-VCS-Branch: wip/mattst88 Date: Sat, 19 Dec 2020 19:56:03 +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: b6fb6c1f-45ed-49fa-ba56-c0f18ccc5811 X-Archives-Hash: a620258ba7e6e902efe1ce525784bbc2 commit: f229afe0e328d8d89df72097e316dadcec40aa7b Author: Matt Turner gentoo org> AuthorDate: Fri Dec 18 17:35:27 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f229afe0 targets: Pass separate arguments to run_merge() Signed-off-by: Matt Turner gentoo.org> 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 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 48F5713835A for ; Sun, 27 Dec 2020 23:15:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E867E0DE9; Sun, 27 Dec 2020 23:15:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 57FD2E0DE9 for ; Sun, 27 Dec 2020 23:15:25 +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 D2EF7340F70 for ; Sun, 27 Dec 2020 23:15:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 56A27476 for ; Sun, 27 Dec 2020 23:15:22 +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: <1608346612.f229afe0e328d8d89df72097e316dadcec40aa7b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage3/, targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh targets/stage3/chroot.sh X-VCS-Directories: targets/stage1/ targets/stage3/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f229afe0e328d8d89df72097e316dadcec40aa7b X-VCS-Branch: master Date: Sun, 27 Dec 2020 23:15: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: 3e646743-7c41-4db2-9842-598b04df4b30 X-Archives-Hash: 509ae602617b9130357c5befed9369ce Message-ID: <20201227231522.2pN8dgQ9g5W98_FsLHqTQ4iK-2AMuJxdXL_reNL_gBA@z> commit: f229afe0e328d8d89df72097e316dadcec40aa7b Author: Matt Turner gentoo org> AuthorDate: Fri Dec 18 17:35:27 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f229afe0 targets: Pass separate arguments to run_merge() Signed-off-by: Matt Turner gentoo.org> 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 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 2309B13835A for ; Mon, 18 Jan 2021 19:53:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D746E0817; Mon, 18 Jan 2021 19:53:50 +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 07B7AE0817 for ; Mon, 18 Jan 2021 19:53:50 +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 174EE340F08 for ; Mon, 18 Jan 2021 19:53:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F0674AA for ; Mon, 18 Jan 2021 19:53:46 +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: <1608346612.f229afe0e328d8d89df72097e316dadcec40aa7b.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:pending/mattst88 commit in: targets/stage3/, targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/chroot.sh targets/stage3/chroot.sh X-VCS-Directories: targets/stage1/ targets/stage3/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: f229afe0e328d8d89df72097e316dadcec40aa7b X-VCS-Branch: pending/mattst88 Date: Mon, 18 Jan 2021 19:53:46 +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: 4ee39b6c-308b-4dda-8e0c-99e1433768e8 X-Archives-Hash: d6fb73aefdd2f99735f4e2cfff3e60d3 Message-ID: <20210118195346.y7gnjycVnQDFz45_b-2dAVW7uFg8HZGiBedSQ7UmlUc@z> commit: f229afe0e328d8d89df72097e316dadcec40aa7b Author: Matt Turner gentoo org> AuthorDate: Fri Dec 18 17:35:27 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sat Dec 19 02:56:52 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=f229afe0 targets: Pass separate arguments to run_merge() Signed-off-by: Matt Turner gentoo.org> 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