From nobody Tue Aug 9 21:59:05 2022 X-Original-To: dev-commits-src-main@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 4M2RmT53D4z4YHTR; Tue, 9 Aug 2022 21:59:05 +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 4M2RmT4c1gz429w; Tue, 9 Aug 2022 21:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082345; 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=O3yX43GwGFVBnpAEbpbZl+wtEEYg/2rfis7NW0JaKv4=; b=Cg1LOUMXlJycEFbCeaMIEz9vq/74klFHpBWYvVbCi2o8l+8iH12QA21nndUwrOk+W/mSnm cQf7sSc2MdBq0Uj0QCqa8tMKDHadX6ZBw47jAAOhQa6+SGry0iz25Mx8xjVY5Vwmqumg9N uMdkSyA8APiYQCO3M1aqloRJABUmQf4zy1GhgVf745BHOInIJrXCxIrVXt1hqolWl3KJva WNzbXmMtpAMCvXnuJA/fpdWu9SA5KmzvNdEF1+0Lo4v2gaX9ccCC4ySM26RxAKldR09HAh oaK1tudpeVBNhEJ4IWP5AU2bfVATfvEQFFKRJSJL+nqfN/uF0MLBP+zVg//KYg== 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 4M2RmT3g28zn8t; Tue, 9 Aug 2022 21:59:05 +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 279Lx593086474; Tue, 9 Aug 2022 21:59:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279Lx5gN086473; Tue, 9 Aug 2022 21:59:05 GMT (envelope-from git) Date: Tue, 9 Aug 2022 21:59:05 GMT Message-Id: <202208092159.279Lx5gN086473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: f37724399606 - main - release: Forward ${MAKE} to etcupdate via the new -m flag List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f377243996062859b7fc011943aa781333843c32 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082345; 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=O3yX43GwGFVBnpAEbpbZl+wtEEYg/2rfis7NW0JaKv4=; b=vg/HytEhWnPT1cpi330rs9VpOPG9nyA0GVoiu/194pAhXyhA49jmjwm9XWOFBdfUeTLbJI kWti31WMcb9nLstDYbYL9aY3oxaYBodZGC2GVFjk7R9cmp+KTbOK/uWekFLQWHSiS8oSXQ gliHwYLHA6tCk63ht+GDgRzocyxj7kvIB8KGoZ6JanGWu5gTtbJYwiZpw3dCHbA2H5FgTk pigdMSbRqsbr+67HVDse9PfNDJUzUVcXtQzd+7Z+y4CHGGE5LHLjFHuSISaLXUINMEX7Is CKBwaMJFwXjfTfDgFlIWw30QIwGHMJT1bnme8GYx5cylzM3j52+wgGNdJ4/Igg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660082345; a=rsa-sha256; cv=none; b=iMgDP//k4CjoUT8CKo34w9vDbvqXLGvC/aWhs2mup3gUM3tTIfmnXuw79jiAyJ2OV8g6B9 AwwSe8gUVOUgkY/q7Ww9G7e87AF36fpYIVwCAIXlfN0jJQnhuFCuutVdkCbGHZDdM4WlWV h+SW5lGA4qyu8QZd80vMQ3QiPRcNiCS+M9aTNKrSDUV0liQMnZUR1bTJ5zFUiqY6vhGaSE CZjlllbcPKwTUyTkNSAGiMa0QIsk1W0bO876H/CgK22ohVJo0D5hqzlr/nkHBUx2wskqiZ Fa1WC4jHbIHoQC7qcrgk7V/70INu72yOJvY4EvIFCdq9gUeHhXHEleuGEaKrXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=f377243996062859b7fc011943aa781333843c32 commit f377243996062859b7fc011943aa781333843c32 Author: Jessica Clarke AuthorDate: 2022-08-09 21:57:01 +0000 Commit: Jessica Clarke CommitDate: 2022-08-09 21:57:01 +0000 release: Forward ${MAKE} to etcupdate via the new -m flag This is in preparation for non-FreeBSD builds where make is GNU make and so etcupdate needs to know the name of or path to the bmake binary to use for its own builds. Reviewed by: gjb Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35855 --- release/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index c8639b43a3be..fe932b3d1a76 100644 --- a/release/Makefile +++ b/release/Makefile @@ -124,7 +124,7 @@ base.txz: "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \ -D "${.OBJDIR}/${DISTDIR}/base" sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \ - -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ + -m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \ -s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" .endif # Package all components