build: bring back "vga", different approach incoming...

Makefile

@@ -1,6 +1,6 @@
 STEPS=		base boot cdrom chroot clean core distfiles \
 		kernel nano plugins ports prefetch rebase \
-		release serial sign skim test uefi vm
+		release serial sign skim test vga vm
 .PHONY:		${STEPS}
 
 PAGER?=		less
@@ -49,10 +49,10 @@ ports distfiles: base
 plugins: ports
 core: plugins
 packages: core
-cdrom vm serial uefi nano: packages kernel
+cdrom vm serial vga nano: packages kernel
 sets: distfiles packages kernel
-images: cdrom nano serial uefi vm
-release: cdrom nano serial uefi
+images: cdrom nano serial vga vm
+release: cdrom nano serial vga
 
 # Expand target arguments for the script append:
 

README.md

@@ -115,9 +115,9 @@ A serial memstick image is created using:
 
     # make serial
 
-A uefi memstick image is created using:
+A vga memstick image is created using:
 
-    # make uefi
+    # make vga
 
 A flash card disk image (NanoBSD) is created using:
 
@@ -143,7 +143,7 @@ define hooks in the form of e.g.:
     }
 
 These hooks are available for all image types, namely
-cdrom, nano, serial, uefi and vm.  Device-specific hooks
+cdrom, nano, serial, vga and vm.  Device-specific hooks
 are loaded after config-specific hooks and both of them
 can coexist in a given build.
 
@@ -234,7 +234,7 @@ Available clean options are:
 * sets:		remove all sets
 * src:		reset kernel/base build directory
 * stage:	reset main staging area
-* uefi:		remove uefi image
+* vga:		remove vga image
 * vm:		remove vm image
 
 The ports tree has a few of our modifications and is sometimes a

build/clean.sh

@@ -98,9 +98,9 @@ for ARG in ${@}; do
 		setup_stage /usr/obj${SRCDIR}
 		rm -r /usr/obj${SRCDIR}
 		;;
-	uefi)
-		echo ">>> Removing uefi image"
-		rm -f ${IMAGESDIR}/*-uefi-${ARCH}.*
+	vga)
+		echo ">>> Removing vga image"
+		rm -f ${IMAGESDIR}/*-vga-${ARCH}.*
 		;;
 	vm)
 		echo ">>> Removing vm image"

build/vga.sh

@@ -27,18 +27,18 @@
 
 set -e
 
-SELF=uefi
+SELF=vga
 
 . ./common.sh && $(${SCRUB_ARGS})
 
 if [ ${ARCH} != "amd64" ]; then
-	echo ">>> Skipping uefi image for ${ARCH}"
+	echo ">>> Skipping vga image for ${ARCH}"
 	exit 0
 fi
 
 check_images ${SELF} ${@}
 
-UEFIIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-uefi-${ARCH}.img"
+VGAIMG="${IMAGESDIR}/${PRODUCT_RELEASE}-vga-${ARCH}.img"
 
 # rewrite the disk label, because we're install media
 LABEL="${LABEL}_Install"
@@ -61,7 +61,7 @@ EOF
 
 makefs -B little -o label=${LABEL} ${STAGEDIR}/root.part ${STAGEDIR}/work
 
-mkimg -s gpt -o ${UEFIIMG} -b ${STAGEDIR}/work/boot/pmbr \
+mkimg -s gpt -o ${VGAIMG} -b ${STAGEDIR}/work/boot/pmbr \
     -p efi:=${STAGEDIR}/work/boot/boot1.efifat \
     -p freebsd-boot:=${STAGEDIR}/work/boot/gptboot \
     -p freebsd-ufs:=${STAGEDIR}/root.part