diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-04-05 17:16:01 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2021-04-05 17:16:01 +0000 |
| commit | 4bbfa3d3baf70492ad4c3eacace0f966f3ca7070 (patch) | |
| tree | 7e837b920acbeb7c6abff43364d0fa621e9a70ab /release/Makefile | |
| parent | 0c9f52d4cebf18addbea45bd19abd910ba1ea43b (diff) | |
| download | src-4bbfa3d3baf70492ad4c3eacace0f966f3ca7070.tar.gz src-4bbfa3d3baf70492ad4c3eacace0f966f3ca7070.zip | |
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
Diffstat (limited to 'release/Makefile')
| -rw-r--r-- | release/Makefile | 6 |
1 files 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 |