Kill aout to elf upgrade path. From an old comment in the makefile:

# If -DWANT_AOUT is specified, a `make world' with OBJFORMAT=elf will
# update the legacy support for aout. This includes all libraries, ld.so
# and boot objects. This part of build should be regarded as
# deprecated and you should _not_ expect to be able to do this past the
# release of 4.0. You have exactly one major release to move entirely
# to elf.

Now that we're past 5.0, these aren't needed at all anymore and it is
well past its freshness date.

1 files changed, 0 insertions, 46 deletions

diff --git a/Makefile b/Makefile
index a2a5d45..5b0045e 100644
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,6 @@
 # upgrade             - Upgrade a.out (2.2.x/3.0) system to the new ELF way
 # most                - Build user commands, no libraries or include files.
 # installmost         - Install user commands, no libraries or include files.
-# aout-to-elf         - Upgrade a system from a.out to elf format (see below).
-# aout-to-elf-build   - Build everything required to upgrade a system from
-#                       a.out to elf format (see below).
-# aout-to-elf-install - Install everything built by aout-to-elf-build (see
-#                       below).
-# move-aout-libs      - Move the a.out libraries into an aout sub-directory
-#                       of each elf library sub-directory.
 #
 # This makefile is simple by design. The FreeBSD make automatically reads
 # the /usr/share/mk/sys.mk unless the -m argument is specified on the
@@ -63,28 +56,6 @@
 # and once the world is built you can cross build a kernel using the
 # buildkernel target.
 #
-# ----------------------------------------------------------------------------
-#
-#           Upgrading an i386 system from a.out to elf format
-#
-#
-# The aout->elf transition build is performed by doing a `make upgrade' (or
-# `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed
-# by a `make aout-to-elf-install', depending on user preference.
-# You need to have at least 320 MB of free space for the object tree.
-#
-# The upgrade process checks the installed release. If this is 3.0-CURRENT,
-# it is assumed that your kernel contains all the syscalls required by the
-# current sources.
-#
-# The upgrade procedure will stop and ask for confirmation to proceed
-# several times. On each occasion, you can type Ctrl-C to abort the
-# upgrade.  Optionally, you can also start it with NOCONFIRM=yes and skip
-# the confirmation steps.
-#
-# ----------------------------------------------------------------------------
-#
-#
 # Define the user-driven targets. These are listed here in alphabetical
 # order, but that's not important.
 #
@@ -194,23 +165,6 @@ make:
 		${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
 
 #
-# Define the upgrade targets. These are listed here in alphabetical
-# order, but that's not important.
-#
-UPGRADE=	aout-to-elf aout-to-elf-build aout-to-elf-install \
-		move-aout-libs
-
-#
-# Handle the upgrade targets, using the source relative mk files.
-#
-
-upgrade:	aout-to-elf
-
-${UPGRADE} : upgrade_checks
-	@cd ${.CURDIR}; \
-		${_MAKE} -f Makefile.upgrade -m ${.CURDIR}/share/mk ${.TARGET}
-
-#
 # universe
 #
 # Attempt to rebuild *everything* for all supported architectures,