From nobody Fri Dec 3 15:20:00 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 25BC618CF06B; Fri, 3 Dec 2021 15:20:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J5Ghw63MHz3Dlq; Fri, 3 Dec 2021 15:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B02DC13072; Fri, 3 Dec 2021 15:20:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B3FK0ZN010117; Fri, 3 Dec 2021 15:20:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3FK0Yh010104; Fri, 3 Dec 2021 15:20:00 GMT (envelope-from git) Date: Fri, 3 Dec 2021 15:20:00 GMT Message-Id: <202112031520.1B3FK0Yh010104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 0a2bc1aae36b - stable/12 - release: move installworld before installkernel List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0a2bc1aae36b44b2c9e16684bc6270b8a82943e2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638544800; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K83QhesVGsERlUIWpAN02ZNTonrWBw2zXN85LbxPyYk=; b=QeGhD2tV/jl//fRGHFz9diTEp/US+71btxfCAfEOpLDO401ULd0j0CqBPzLfPATN+KHoJ8 aDoYAQwdWyRj37Llg1GXQKlzaBNSjCY2HjB0DYzDiMNovoQcCiq26QqHnaUzw5B5LRWgnL JW5eidKAlJ5wOFrTC4J/w7p24pEg92nFZz4+U6ShTEbHVBgRM14fbELZWsSO5eZ/q+x8lU VVzSSiidByV01skZwVlmDHTl5V+o3Qaq5D1K13syt/a71/YxZjZ8uPKioKJXU8QV3vZ4Kc jr+3I0ALf4AmLd1AFyfs9l+9XERlE+O+PJUnA1CJE1G+Juy/KKozJEi8WEVYqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638544800; a=rsa-sha256; cv=none; b=ll+Ofv4MohP+SefdVD/kW6r3Ba+0KsfyawkMqtwklLluJQRFJ/wlOFIpYItv26h1wUv3Sd 0lnCcV2rojwWFlgYmRVfJBylwW3IMn3hEKnXbGnjShQQAUNNZ1Z33YWZ/n2pXug5d5TPW4 VIh0r49oDEfw++eqHhjR6AnWZnh1VQ+tYIMBmBdSfDvHYsBkdZtJjHUo2xp2NbczjTn2So bgDq8ZAlqlxz62oYM6z9lfqa4XuXuZZhQJuGEa4tSTEtZpAovVg5f8A97DFlW4zGZxSPm7 NzKH3fl+LJWvXuLMJt9MuFNVMv2oichjvlmwKlE+ISiwfz+TKDhRfDssgzmp8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0a2bc1aae36b44b2c9e16684bc6270b8a82943e2 commit 0a2bc1aae36b44b2c9e16684bc6270b8a82943e2 Author: Ed Maste AuthorDate: 2021-04-05 17:16:01 +0000 Commit: Ed Maste CommitDate: 2021-12-03 15:19:09 +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 (cherry picked from commit 4bbfa3d3baf70492ad4c3eacace0f966f3ca7070) --- release/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 09b1b6a2c855..1b939d8051d8 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_AMD=no MK_AT=no \ MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ MK_NCP=no MK_TOOLCHAIN=no MK_PROFILE=no \ @@ -176,7 +176,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_AMD=no MK_AT=no \ MK_GAMES=no \ MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ @@ -198,7 +198,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