Attachment #866757 for bug #911536

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

Lines 130-135 class StageBase(TargetBase, ClearBase, GenBase): Link Here

(-)a/catalyst/base/stagebase.py (+2 lines)
130	for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]:	130	for arch in [x for x in arch_config if x.startswith(name) and host in arch_config[x]]:
131	self.settings.update(arch_config[arch][host])	131	self.settings.update(arch_config[arch][host])
132	setarch = arch_config.get('setarch', {}).get(arch, {})	132	setarch = arch_config.get('setarch', {}).get(arch, {})
		133	# Save basearch for bootloader/livecd creation
		134	self.settings["basearch"] = arch
133	break	135	break
134	else:	136	else:
135	# Didn't find a matching subarchitecture, keep searching	137	# Didn't find a matching subarchitecture, keep searching

Lines 55-61 memtest_grub() { Link Here

(-)a/targets/support/bootloader-setup.sh (-1 / +4 lines)
55		55
56	default_append_line=(${cmdline_opts[@]} cdroot)	56	default_append_line=(${cmdline_opts[@]} cdroot)
57		57
58	case ${clst_hostarch} in	58	case ${clst_basearch} in
59	alpha)	59	alpha)
60	# NO SOFTLEVEL SUPPORT YET	60	# NO SOFTLEVEL SUPPORT YET
61	acfg=$1/etc/aboot.conf	61	acfg=$1/etc/aboot.conf
Lines 202-206 case ${clst_hostarch} in Link Here
202	[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload	202	[ -e "${1}/sash64" ] && mv ${1}/sash64 ${scratch}/arcload
203	[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload	203	[ -e "${1}/arc.cf" ] && mv ${1}/arc.cf ${scratch}/arcload
204	;;	204	;;
		205	*)
		206	die "Cannot create ISO image: unsupported ARCH=${clst_basearch}"
		207	;;
205	esac	208	esac
206	exit $?	209	exit $?




## START RUNSCRIPT

# Check for our CD ISO creation tools
case ${clst_basearch} in
	alpha)
		cdmaker="xorriso"
		cdmakerpkg="dev-libs/libisoburn"

then
	case ${clst_livecd_type} in
		gentoo-*)
			case ${clst_basearch} in
				alpha)
					clst_iso_volume_id="Gentoo Linux - Alpha"
				;;

}

# Here we actually create the ISO images for each architecture
case ${clst_basearch} in
	alpha)
		isoroot_checksum


		isoroot_checksum

		extra_opts=("-joliet" "-iso-level" "3")
		case ${clst_basearch} in
		sparc*) extra_opts+=("--sparc-boot") ;;
		esac

		echo ">> Running grub-mkrescue to create iso image...."
		grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
	;;
	*)
		die "Cannot create ISO image: unsupported ARCH=${clst_basearch}"
	;;
esac
exit  $?

Lines 19-25 rmdir ${clst_target_path}/boot Link Here

(-)a/targets/support/netboot-final.sh (-1 / +1 lines)
19		19
20	# Any post-processing necessary for each architecture can be done here. This	20	# Any post-processing necessary for each architecture can be done here. This
21	# may include things like sparc's elftoaout, x86's PXE boot, etc.	21	# may include things like sparc's elftoaout, x86's PXE boot, etc.
22	case ${clst_hostarch} in	22	case ${clst_basearch} in
23	hppa)	23	hppa)
24	# Only one kernel should be there	24	# Only one kernel should be there
25	kname=${clst_boot_kernel[0]}	25	kname=${clst_boot_kernel[0]}

Lines 4-10 RUN_DEFAULT_FUNCS="yes" Link Here

(-)a/targets/support/pre-kmerge.sh (-2 / +1 lines)
4		4
5	source /tmp/chroot-functions.sh	5	source /tmp/chroot-functions.sh
6		6
7	if [[ ${clst_hostarch} == hppa ]]; then	7	if [[ ${clst_basearch} == hppa ]]; then
8	for i in ${clst_boot_kernel}; do	8	for i in ${clst_boot_kernel}; do
9	case ${i} in	9	case ${i} in
10	*32)	10	*32)
11	-

Return to bug 911536

Lines 5-11 source ${clst_shdir}/support/functions.sh Link Here

(-)a/targets/support/create-iso.sh (-4 / +7 lines)
5	## START RUNSCRIPT	5	## START RUNSCRIPT
6		6
7	# Check for our CD ISO creation tools	7	# Check for our CD ISO creation tools
8	case ${clst_hostarch} in	8	case ${clst_basearch} in
9	alpha)	9	alpha)
10	cdmaker="xorriso"	10	cdmaker="xorriso"
11	cdmakerpkg="dev-libs/libisoburn"	11	cdmakerpkg="dev-libs/libisoburn"
Lines 42-48 if [ -z "${clst_iso_volume_id}" ] Link Here
42	then	42	then
43	case ${clst_livecd_type} in	43	case ${clst_livecd_type} in
44	gentoo-*)	44	gentoo-*)
45	case ${clst_hostarch} in	45	case ${clst_basearch} in
46	alpha)	46	alpha)
47	clst_iso_volume_id="Gentoo Linux - Alpha"	47	clst_iso_volume_id="Gentoo Linux - Alpha"
48	;;	48	;;
Lines 119-125 run_mkisofs() { Link Here
119	}	119	}
120		120
121	# Here we actually create the ISO images for each architecture	121	# Here we actually create the ISO images for each architecture
122	case ${clst_hostarch} in	122	case ${clst_basearch} in
123	alpha)	123	alpha)
124	isoroot_checksum	124	isoroot_checksum
125		125
Lines 195-206 case ${clst_hostarch} in Link Here
195	isoroot_checksum	195	isoroot_checksum
196		196
197	extra_opts=("-joliet" "-iso-level" "3")	197	extra_opts=("-joliet" "-iso-level" "3")
198	case ${clst_hostarch} in	198	case ${clst_basearch} in
199	sparc*) extra_opts+=("--sparc-boot") ;;	199	sparc*) extra_opts+=("--sparc-boot") ;;
200	esac	200	esac
201		201
202	echo ">> Running grub-mkrescue to create iso image...."	202	echo ">> Running grub-mkrescue to create iso image...."
203	grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"	203	grub-mkrescue "${extra_opts[@]}" -o "${1}" "${clst_target_path}"
204	;;	204	;;
		205	*)
		206	die "Cannot create ISO image: unsupported ARCH=${clst_basearch}"
		207	;;
205	esac	208	esac
206	exit $?	209	exit $?