[gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/

[gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/

[Brian Dolbec]

commit:     6ee5e3a21ba6720a3a272228184cc910d17eed00
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 17 15:22:41 2013 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=6ee5e3a2

chmod +x targets/stage1/build.py

---
 targets/stage1/build.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/targets/stage1/build.py b/targets/stage1/build.py
old mode 100644
new mode 100755

[gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/

[Brian Dolbec]

commit:     8633584a786fd9e1beeae8de7483bc5ecc4df494
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 26 01:31:00 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Sep  2 05:40:02 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=8633584a

stage1-controller.sh: Remove some old poor cleaning code

This code had portage bin path hard coded.  That path needed to be
changed for a new portage ebuild and install system.
After testing the origianl code and comparing it with some updated code
supplied by Douglas Freed.  It turned out both code chunks resulted in
nothing being cleaned.

Tested-by: Rick Zero_Chaos Farina <zerochaos <AT> gentoo.org>

---
 targets/stage1/stage1-controller.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/targets/stage1/stage1-controller.sh b/targets/stage1/stage1-controller.sh
index 3671095..ed315f1 100755
--- a/targets/stage1/stage1-controller.sh
+++ b/targets/stage1/stage1-controller.sh
@@ -31,11 +31,6 @@ case $1 in
 		rm -rf usr/share/{man,doc,info}/*
 		# Zap all .pyc and .pyo files
 		find . -iname "*.py[co]" -exec rm -f {} \;
-		# Cleanup all .a files except libgcc.a, *_nonshared.a and
-		# /usr/lib/portage/bin/*.a
-		find . -type f -iname "*.a" | grep -v 'libgcc.a' | \
-			grep -v 'nonshared.a' | grep -v '/usr/lib/portage/bin/' | \
-			grep -v 'libgcc_eh.a' | xargs rm -f
 	;;
 
 	*)

[gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/

[Anthony G. Basile]

commit:     43b44d59d820ecec9866fe2447f3ace1078a372b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 20:23:01 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 20:30:53 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=43b44d59

targets/stage1/stage1-chroot.sh: don't quote ${clst_HOSTUSEEXPAND}

Remove the quotes on ${clst_HOSTUSEEXPAND} so the for loops skip
any iterations when clst_HOSTUSEEXPAND is unset.  Otherwise a
spurious line is introduced in the make.conf file which causes
a syntax error.

To illustrate the problem, run the follow two lines of bash:

  unset A ; for i in $A; do echo x${i}x ; done    #line 1
  unset A ; for i in "$A"; do echo x${i}x ; done  #line 2

Line 1 leads to no output, while line 2 leads to "xx".

We also fix a typo in the sed line.

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 targets/stage1/stage1-chroot.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f79f360..63aa563 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -57,7 +57,7 @@ sed -i '/USE="${USE} -build"/d' /etc/portage/make.conf
 if [ -e /etc/portage/make.conf ]; then
 	echo "USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"" \
 	>> /etc/portage/make.conf
-	for useexpand in "${clst_HOSTUSEEXPAND}"; do
+	for useexpand in ${clst_HOSTUSEEXPAND}; do
 		x="clst_${useexpand}"
 		echo "${useexpand}=\"${!x}\"" \
 		>> /etc/portage/make.conf
@@ -66,8 +66,8 @@ fi
 run_merge "--oneshot ${clst_buildpkgs}"
 sed -i "/USE=\"-* build ${BOOTSTRAP_USE} ${clst_HOSTUSE}\"/d" \
 	/etc/portage/make.conf
-for useexpand in "${clst_HOSTUSEEXPAND}"; do
+for useexpand in ${clst_HOSTUSEEXPAND}; do
 	x="clst_${useexpand}"
-	sed -i "${useexpand}=\"${!x}\"" \
+	sed -i "/${useexpand}=\"${!x}\"/d" \
 	/etc/portage/make.conf
 done

[gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/

[Brian Dolbec]

commit:     dbdbb28755e61bddcb5b632518df6954a7bb0b00
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  8 20:26:24 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 20:26:24 2015 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=dbdbb287

targets/stage1/build.py: Fix bug 554154

portage.dep_getkey(pkgs[idx])

This always throws and exception because of the leading '*' making the purpose
of the entire loop from 28-35 useless.

X-Gentoo-Bug: 554154
X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=554154
X-Gentoo-Reporter: Anthony Basile <bluness <AT> gentoo.org>

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 targets/stage1/build.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/targets/stage1/build.py b/targets/stage1/build.py
index bf20bcf..8a8a3b1 100755
--- a/targets/stage1/build.py
+++ b/targets/stage1/build.py
@@ -26,11 +26,11 @@ buildpkgs = scan_profile("packages.build")
 # system profile (it may have <,>,=,etc... operators
 # and version numbers)
 for idx in range(0, len(pkgs)):
+	pkg = pkgs[idx].lstrip('*')
 	try:
-		bidx = buildpkgs.index(portage.dep_getkey(pkgs[idx]))
-		buildpkgs[bidx] = pkgs[idx]
-		if buildpkgs[bidx][0:1] == "*":
-			buildpkgs[bidx] = buildpkgs[bidx][1:]
-	except: pass
+		bidx = buildpkgs.index(portage.dep_getkey(pkg))
+		buildpkgs[bidx] = pkg
+	except:
+		pass
 
 for b in buildpkgs: sys.stdout.write(b+" ")

[gentoo-commits] proj/catalyst:2.X commit in: targets/stage1/

[Anthony G. Basile]

commit:     5fd2d5edd3c4c1e99687beb9acc130bab162866b
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  4 16:43:44 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Jun  4 16:52:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=5fd2d5ed

stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for setup_gcc()

setup_gcc() calls gcc-config to select a particular gcc profile.  At stage1 this
needs to be done in the /tmp/stage1root chroot.  gcc-config looks for ROOT to
choose the root directory in which to make the selection.  If we don't export
ROOT, then setup_gcc is ineffective.

X-Gentoo-Bug: 584234
X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 targets/stage1/stage1-preclean-chroot.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
index a80fc92..dc67521 100755
--- a/targets/stage1/stage1-preclean-chroot.sh
+++ b/targets/stage1/stage1-preclean-chroot.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+export ROOT=/tmp/stage1root
 export RUN_DEFAULT_FUNCS="no"
 
 source /tmp/chroot-functions.sh
@@ -8,8 +9,6 @@ update_env_settings
 show_debug
 
 # Now, some finishing touches to initialize gcc-config....
-unset ROOT
-
 setup_gcc
 setup_binutils