git: 4bbfa3d3baf7 - main - release: move installworld before installkernel

[Ed Maste]

The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=4bbfa3d3baf70492ad4c3eacace0f966f3ca7070

commit 4bbfa3d3baf70492ad4c3eacace0f966f3ca7070
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-04-05 17:16:01 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-04-05 17:16:01 +0000

    release: move installworld before installkernel
    
    To support -DNO_ROOT work.  The top-level installworld target creates a
    new METALOG starting with `#mtree 2.0` so it needs to be first, to avoid
    overwriting installkernel METALOG entries.
    
    Reviewed by:    gjb
    MFC after:      1 month
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D29582
---
 release/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index fee5f9acf59b..c176ae6f2bb7 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -152,7 +152,7 @@ ports.txz:
 disc1: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
-	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
+	cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
 	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \
 	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
 	    MK_TOOLCHAIN=no MK_PROFILE=no \
@@ -177,7 +177,7 @@ disc1: packagesystem
 bootonly: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
-	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
+	cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
 	    DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \
 	    MK_GAMES=no \
 	    MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \
@@ -200,7 +200,7 @@ bootonly: packagesystem
 dvd: packagesystem
 # Install system
 	mkdir -p ${.TARGET}
-	cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \
+	cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \
 		DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
 		MK_TESTS=no MK_DEBUG_FILES=no \
 		-DDB_FROM_SRC