Project

General

Profile

« Previous | Next » 

Revision 91c40f25

Added by Renato Botelho about 9 years ago

Remove i386 items

View differences:

build.sh
435 435
			create_memstick_adi_image
436 436
			;;
437 437
		nanobsd|nanobsd-vga)
438
			if [ "${TARGET}" = "i386" -a "${_IMGTOBUILD}" = "nanobsd" ]; then
439
				export DEFAULT_KERNEL=${DEFAULT_KERNEL_NANOBSD:-"${PRODUCT_NAME}_wrap"}
440
			elif [ "${TARGET}" = "i386" -a "${_IMGTOBUILD}" = "nanobsd-vga" ]; then
441
				export DEFAULT_KERNEL=${DEFAULT_KERNEL_NANOBSDVGA:-"${PRODUCT_NAME}_wrap_vga"}
442
			elif [ "${TARGET}" = "amd64" ]; then
443
				export DEFAULT_KERNEL=${DEFAULT_KERNEL_NANOBSD:-"${PRODUCT_NAME}"}
444
			fi
445
			# Create the NanoBSD disk image
446 438
			create_nanobsd_diskimage ${_IMGTOBUILD} "${FLASH_SIZE}"
447 439
			;;
448 440
		ova)
tools/builder_common.sh
920 920
		local _os_id="78"
921 921
		local _os_type="freebsd64Guest"
922 922
		local _os_descr="FreeBSD 64-Bit"
923
	elif [ "${TARGET}" = "i386" ]; then
924
		local _os_id="42"
925
		local _os_type="freebsdGuest"
926
		local _os_descr="FreeBSD"
927 923
	else
928 924
		echo ">>> ERROR: Platform not supported for OVA (${TARGET})"
929 925
		print_error_pfS
tools/builder_defaults.sh
146 146
export FREEBSD_BRANCH=${FREEBSD_BRANCH:-"devel"}
147 147
export FREEBSD_SRC_DIR=${FREEBSD_SRC_DIR:-"${SCRATCHDIR}/FreeBSD-src"}
148 148

  
149
if [ "${TARGET}" = "i386" ]; then
150
	export BUILD_KERNELS=${BUILD_KERNELS:-"${PRODUCT_NAME} ${PRODUCT_NAME}_wrap ${PRODUCT_NAME}_wrap_vga"}
151
else
152
	export BUILD_KERNELS=${BUILD_KERNELS:-"${PRODUCT_NAME}"}
153
fi
149
export BUILD_KERNELS=${BUILD_KERNELS:-"${PRODUCT_NAME}"}
154 150

  
155 151
# XXX: Poudriere doesn't like ssh short form
156 152
case "${FREEBSD_REPO_BASE}" in
......
187 183
export MAKEJ_WORLD=${MAKEJ_WORLD:-"${_CPUS}"}
188 184
export MAKEJ_KERNEL=${MAKEJ_KERNEL:-"${_CPUS}"}
189 185

  
190
if [ "${TARGET}" = "i386" ]; then
191
	export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp hwpmc"}
192
else
193
	export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ixgbe"}
194
fi
186
export MODULES_OVERRIDE=${MODULES_OVERRIDE:-"i2c ipmi ndis ipfw ipdivert dummynet fdescfs opensolaris zfs glxsb if_stf coretemp amdtemp aesni sfxge hwpmc vmm nmdm ixgbe"}
195 187

  
196 188
# Area that the final image will appear in
197 189
export IMAGES_FINAL_DIR=${IMAGES_FINAL_DIR:-"${SCRATCHDIR}/${PRODUCT_NAME}/"}

Also available in: Unified diff