Attachment #125423 for bug #185949

View | Details | Raw Unified | Return to bug 185949
Collapse All | Expand All




#!/bin/bash

. ./tmp/chroot-functions.sh

# Now, some finishing touches to initialize gcc-config....
unset ROOT

setup_binutils

# Stage1 is not going to have anything in zoneinfo, so save our Factory timezone
if [ -d ./usr/share/zoneinfo ]
then
	rm -f ./etc/localtime
	cp ./usr/share/zoneinfo/Factory ./etc/localtime
else
	echo UTC > ./etc/TZ
fi

#if [ -n "${clst_CCACHE}" ]




#!/bin/bash

. ./tmp/chroot-functions.sh

update_env_settings

setup_myfeatures

# Setup our environment
export clst_buildpkgs="$(./tmp/build.py)"
export STAGE1_USE="$(portageq envvar STAGE1_USE)"
export USE="-* build ${STAGE1_USE}"
export FEATURES="${clst_myfeatures} nodoc noman noinfo"

clst_root_path=/ setup_portage

run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
rm -f ./var/lib/portage/world
touch ./var/lib/portage/world

rm -f ./var/log/emerge.log




}

setup_gcc(){
	if [ -x ./usr/bin/gcc-config ]
	then
		mythang=$( cd ./etc/env.d/gcc; ls ${clst_CHOST}-* | head -n 1 )
		if [ -z "${mythang}" ]
		then
			mythang=1

}

setup_binutils(){
	if [ -x ./usr/bin/binutils-config ]
	then
		mythang=$( cd ./etc/env.d/binutils; ls ${clst_CHOST}-* | head -n 1 )
		if [ -z "${mythang}" ]
		then
			mythang=1

Return to bug 185949

Lines 1-13 Link Here

(-)targets/stage1/stage1-chroot.sh (-5 / +5 lines)
1	#!/bin/bash	1	#!/bin/bash
2		2
3	. /tmp/chroot-functions.sh	3	. ./tmp/chroot-functions.sh
4		4
5	update_env_settings	5	update_env_settings
6		6
7	setup_myfeatures	7	setup_myfeatures
8		8
9	# Setup our environment	9	# Setup our environment
10	export clst_buildpkgs="$(/tmp/build.py)"	10	export clst_buildpkgs="$(./tmp/build.py)"
11	export STAGE1_USE="$(portageq envvar STAGE1_USE)"	11	export STAGE1_USE="$(portageq envvar STAGE1_USE)"
12	export USE="-* build ${STAGE1_USE}"	12	export USE="-* build ${STAGE1_USE}"
13	export FEATURES="${clst_myfeatures} nodoc noman noinfo"	13	export FEATURES="${clst_myfeatures} nodoc noman noinfo"
Lines 25-31 Link Here
25	clst_root_path=/ setup_portage	27	clst_root_path=/ setup_portage
26		28
27	run_emerge "--noreplace --oneshot ${clst_buildpkgs}"	29	run_emerge "--noreplace --oneshot ${clst_buildpkgs}"
28	rm -f /var/lib/portage/world	30	rm -f ./var/lib/portage/world
29	touch /var/lib/portage/world	31	touch ./var/lib/portage/world
30		32
31	rm -f /var/log/emerge.log	33	rm -f ./var/log/emerge.log

Lines 96-104 Link Here

(-)targets/support/chroot-functions.sh (-4 / +4 lines)
96	}	96	}
97		97
98	setup_gcc(){	98	setup_gcc(){
99	if [ -x /usr/bin/gcc-config ]	99	if [ -x ./usr/bin/gcc-config ]
100	then	100	then
101	mythang=$( cd /etc/env.d/gcc; ls ${clst_CHOST}-* \| head -n 1 )	101	mythang=$( cd ./etc/env.d/gcc; ls ${clst_CHOST}-* \| head -n 1 )
102	if [ -z "${mythang}" ]	102	if [ -z "${mythang}" ]
103	then	103	then
104	mythang=1	104	mythang=1
Lines 108-116 Link Here
108	}	108	}
109		109
110	setup_binutils(){	110	setup_binutils(){
111	if [ -x /usr/bin/binutils-config ]	111	if [ -x ./usr/bin/binutils-config ]
112	then	112	then
113	mythang=$( cd /etc/env.d/binutils; ls ${clst_CHOST}-* \| head -n 1 )	113	mythang=$( cd ./etc/env.d/binutils; ls ${clst_CHOST}-* \| head -n 1 )
114	if [ -z "${mythang}" ]	114	if [ -z "${mythang}" ]
115	then	115	then
116	mythang=1	116	mythang=1

Lines 1-6 Link Here

(-)targets/stage1/stage1-preclean-chroot.sh (-5 / +5 lines)
1	#!/bin/bash	1	#!/bin/bash
2		2
3	. /tmp/chroot-functions.sh	3	. ./tmp/chroot-functions.sh
4		4
5	# Now, some finishing touches to initialize gcc-config....	5	# Now, some finishing touches to initialize gcc-config....
6	unset ROOT	6	unset ROOT
Lines 9-20 Link Here
9	setup_binutils	9	setup_binutils
10		10
11	# Stage1 is not going to have anything in zoneinfo, so save our Factory timezone	11	# Stage1 is not going to have anything in zoneinfo, so save our Factory timezone
12	if [ -d /usr/share/zoneinfo ]	12	if [ -d ./usr/share/zoneinfo ]
13	then	13	then
14	rm -f /etc/localtime	14	rm -f ./etc/localtime
15	cp /usr/share/zoneinfo/Factory /etc/localtime	15	cp ./usr/share/zoneinfo/Factory ./etc/localtime
16	else	16	else
17	echo UTC > /etc/TZ	17	echo UTC > ./etc/TZ
18	fi	18	fi
19		19
20	#if [ -n "${clst_CCACHE}" ]	20	#if [ -n "${clst_CCACHE}" ]