[gentoo-commits] proj/catalyst:master commit in: targets/stage1/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Richard Farina" <zerochaos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/catalyst:master commit in: targets/stage1/
Date: Thu, 15 Sep 2016 00:57:01 +0000 (UTC)	[thread overview]
Message-ID: <1473876280.d6ee458ad47915230291708eaaaf38c059d4fd1c.zerochaos@gentoo> (raw)

commit:     d6ee458ad47915230291708eaaaf38c059d4fd1c
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 18:04:40 2016 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> 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

next             reply	other threads:[~2016-09-15  0:57 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-09-15  0:57 Richard Farina [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-24 20:55 [gentoo-commits] proj/catalyst:master commit in: targets/stage1/ Andreas K. Hüttel
2024-10-10  1:07 Ben Kohler
2022-10-13 16:17 Matt Turner
2021-01-28  1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-28  1:54 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2021-01-23 16:22 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2021-01-18 19:53 [gentoo-commits] proj/catalyst:pending/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-27 23:15 Matt Turner
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-19 19:56 [gentoo-commits] proj/catalyst:wip/mattst88 " Matt Turner
2020-12-16 16:00 ` [gentoo-commits] proj/catalyst:master " Matt Turner
2020-12-16 16:00 Matt Turner
2020-05-16  6:43 Matt Turner
2020-04-10 21:04 Matt Turner
2020-04-10 21:04 Matt Turner
2020-04-08  0:25 Matt Turner
2020-04-08  0:25 Matt Turner
2017-11-29 17:20 Brian Dolbec
2016-09-15  0:57 Richard Farina
2016-09-14 22:12 [gentoo-commits] proj/catalyst:fix_stage1 " Richard Farina
2016-09-15  0:57 ` [gentoo-commits] proj/catalyst:master " Richard Farina
2015-09-08  2:58 Richard Farina
2015-09-03  1:51 Richard Farina
2015-08-30 19:28 Jorge Manuel B. S. Vicetto
2015-08-30  4:32 Jorge Manuel B. S. Vicetto
2015-08-30  3:51 Jorge Manuel B. S. Vicetto
2015-08-30  3:14 Jorge Manuel B. S. Vicetto
2015-05-21 23:53 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2015-05-24  0:08 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-09-02  5:54 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-09-11  3:26 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-02-07 23:24 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2014-01-22 15:52 [gentoo-commits] proj/catalyst:pending " Brian Dolbec
2014-02-07 23:24 ` [gentoo-commits] proj/catalyst:master " Brian Dolbec
2013-01-31  4:00 Richard Farina
2013-01-25  2:46 Matt Turner
2012-12-07  1:49 Jorge Manuel B. S. Vicetto
2012-11-21  5:20 Matt Turner
2012-10-23 17:18 Richard Farina
2012-10-22  1:20 Richard Farina
2012-09-03  3:09 Jorge Manuel B. S. Vicetto
2012-08-31  1:57 Jorge Manuel B. S. Vicetto
2012-08-29  3:18 Jorge Manuel B. S. Vicetto
2012-08-23  5:55 Jorge Manuel B. S. Vicetto
2012-08-23  5:55 Jorge Manuel B. S. Vicetto
2011-11-19 19:43 Jorge Manuel B. S. Vicetto
2011-11-16  4:05 Jorge Manuel B. S. Vicetto

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:3ad0ed5 dfblob:6af1385 dfblob:a80fc92 dfblob:0ba4c00 )
 OR (
bs:"[gentoo-commits] proj/catalyst:master commit in: targets/stage1/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1473876280.d6ee458ad47915230291708eaaaf38c059d4fd1c.zerochaos@gentoo \
    --to=zerochaos@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox