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 29629138331 for ; Thu, 15 Sep 2016 00:57:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6224CE0B25; Thu, 15 Sep 2016 00:57:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 38874E0B25 for ; Thu, 15 Sep 2016 00:57:05 +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 2F3C7340AA1 for ; Thu, 15 Sep 2016 00:57:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C65492483 for ; Thu, 15 Sep 2016 00:57:01 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1473876280.d6ee458ad47915230291708eaaaf38c059d4fd1c.zerochaos@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/stage1/stage1-controller.sh targets/stage1/stage1-preclean-chroot.sh X-VCS-Directories: targets/stage1/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: d6ee458ad47915230291708eaaaf38c059d4fd1c X-VCS-Branch: master Date: Thu, 15 Sep 2016 00:57:01 +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: 016f1eb7-f202-4caa-b838-e2236324eb9c X-Archives-Hash: 94aabcfeeebc47511938571b7e74704c commit: d6ee458ad47915230291708eaaaf38c059d4fd1c Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Wed Sep 14 18:04:40 2016 +0000 Commit: Richard Farina gentoo org> CommitDate: Wed Sep 14 18:04:40 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=d6ee458a operate in /tmp/stage1root as appropriate during stage1 targets/stage1/stage1-controller.sh | 4 ++-- targets/stage1/stage1-preclean-chroot.sh | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh index 3ad0ed5..6af1385 100755 --- a/targets/stage1/stage1-controller.sh +++ b/targets/stage1/stage1-controller.sh @@ -28,9 +28,9 @@ case "$1" in clean) # Clean out man, info and doc files - rm -rf usr/share/{man,doc,info}/* + rm -rf /tmp/stage1root/usr/share/{man,doc,info}/* # Zap all .pyc and .pyo files - find . -iname "*.py[co]" -exec rm -f {} \; + find /tmp/stage1root/ -iname "*.py[co]" -exec rm -f {} \; ;; *) diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh index a80fc92..0ba4c00 100755 --- a/targets/stage1/stage1-preclean-chroot.sh +++ b/targets/stage1/stage1-preclean-chroot.sh @@ -1,25 +1,27 @@ #!/bin/bash export RUN_DEFAULT_FUNCS="no" +export ROOT=/tmp/stage1root source /tmp/chroot-functions.sh update_env_settings show_debug -# Now, some finishing touches to initialize gcc-config.... -unset ROOT - +# Right now these will parse the unpacked stage3 but change things +# inside of /tmp/stage1root due to ROOT env variable setup_gcc setup_binutils # Stage1 is not going to have anything in zoneinfo, so save our Factory timezone -if [ -d /usr/share/zoneinfo ] +if [ -d "${ROOT}/usr/share/zoneinfo" ] then - rm -f /etc/localtime - cp /usr/share/zoneinfo/Factory /etc/localtime + rm -f "${ROOT}/etc/localtime" + cp "${ROOT}/usr/share/zoneinfo/Factory" "${ROOT}/etc/localtime" else - echo UTC > /etc/TZ + echo UTC > "${ROOT}/etc/TZ" fi +# unset ROOT for safety (even though cleanup_stages doesn't use it) +unset ROOT cleanup_stages