From nobody Tue Aug 09 21:59:04 2022 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 4M2RmS6HF1z4YHTK; Tue, 9 Aug 2022 21:59:04 +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 4M2RmS3zT0z42Hx; Tue, 9 Aug 2022 21:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082344; 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=yDn5llQj9SwIl6fkq5iBFwUSi+QLpC916B8JhxceYVY=; b=O/zAwMBibT1GGH6/JyxNAxjpJfocp6Ou0CYHLqpFEie/JwR7KNSmGKRwMXipN5YpWmdxv8 cJDf97O3SrsbbU/EIB4n0YeY8nl7U+JfyKOGjPW6Pb3weKZ5AiRByyuYmt7WxHX9tjlBQl aCDpZzvV4L2uJ2senDj/fo8OGlVG51nrnm+P//O3mGGd1pYB9XeDhkTDUeq+Sfac3BW4og MdJX/d6eq51vCLRLbVEnxOUgUvMIlYjwtjd3eG9lwnA9eRa1CgggXgqUsjhWqd1Eju+79q T0QGz6AHsWIU5/6R+6rBS8FutXDIe3GGhgVYPedq8ihvo2F2aesdt3s/8KdmxQ== 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 4M2RmS2tzXznWM; Tue, 9 Aug 2022 21:59:04 +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 279Lx4S6086450; Tue, 9 Aug 2022 21:59:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 279Lx4hq086449; Tue, 9 Aug 2022 21:59:04 GMT (envelope-from git) Date: Tue, 9 Aug 2022 21:59:04 GMT Message-Id: <202208092159.279Lx4hq086449@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: 5513d7dee5dd - main - etcupdate: Add a -m flag to change the make binary that's run 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5513d7dee5ddddb1ace63f2df3117c011fc4d50b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660082344; 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=yDn5llQj9SwIl6fkq5iBFwUSi+QLpC916B8JhxceYVY=; b=rd/wV4wDN0fbCYK2pl8mbpx7YI6PfxT3ca4EvZFjDJOFNh+Q7hNTOysuyaWpKS10apa2e+ E4ig/PD9bi5rzf/1mhe5BdRNVMxda9WrJsXbfnFrgd4KzvH96y0T0QSshDixUzVWUEQJBt q1lk4aUQFopDjFPwpDBsznSnLJvFmIGKP6wBGs3+TZgujG3f/UvoU3Lbn4Zy/ab7jvaUsI vn6s4mhIwRCUg+LfaJ6dGyMpXTJKGGLMLi3wCrmeoi8UqB9mo3Ni3jkvCGOJbveC0kcv87 U/cmF0S6BOIiptHKTvdpPsL0rPY//Tj9IpwrzSVXoAB1IzuGz24IBpbVr0bsaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660082344; a=rsa-sha256; cv=none; b=HsUXchQDVLpmvZwlYFtQZkOGidoTqRc3YYlciZ0RLrJcp8Aoe9zYznuw8InHxAlj8aG94o nTKbhZkPzYhptmqUuAfnVoBbbKuLxmm8QTX75E1YgovF5VwwwEXWP77brRiHcYGyMoudAU +QyHuaSEagItXtOC6NJgsyT4zBgGDry8qpNrVcG8h81b8yix2y3nmGrAK4fMOx1u6idVyW Hb4HY6g/fxNlGrEb+sHdNwf/KsdJOdUlMBj7ItLmfldjkUHZ+F4whevGXFiuYpY8M7re0f AWxW+Y6K9MlJL4cHbM8ef1MsSpkI5eW/PQ8xsF+Nn+69SMVFFw89wlzxsLp7Cg== 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=5513d7dee5ddddb1ace63f2df3117c011fc4d50b commit 5513d7dee5ddddb1ace63f2df3117c011fc4d50b Author: Jessica Clarke AuthorDate: 2022-08-09 21:56:19 +0000 Commit: Jessica Clarke CommitDate: 2022-08-09 21:56:19 +0000 etcupdate: Add a -m flag to change the make binary that's run This will allow release/Makefile to forward on ${MAKE} to allow building on non-FreeBSD systems where ${MAKE} is something other than make, as make is typically GNU make in such situations. Reviewed by: jhb, pauamma Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D35854 --- usr.sbin/etcupdate/etcupdate.8 | 21 ++++++++++++++++++++- usr.sbin/etcupdate/etcupdate.sh | 17 ++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/usr.sbin/etcupdate/etcupdate.8 b/usr.sbin/etcupdate/etcupdate.8 index 3d48e218494c..be107f6a214d 100644 --- a/usr.sbin/etcupdate/etcupdate.8 +++ b/usr.sbin/etcupdate/etcupdate.8 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 20, 2021 +.Dd August 9, 2022 .Dt ETCUPDATE 8 .Os .Sh NAME @@ -41,6 +41,7 @@ .Op Fl I Ar patterns .Op Fl L Ar logfile .Op Fl M Ar options +.Op Fl m Ar make .Nm .Cm build .Op Fl B @@ -48,6 +49,7 @@ .Op Fl s Ar source .Op Fl L Ar logfile .Op Fl M Ar options +.Op Fl m Ar make .Ar tarball .Nm .Cm diff @@ -63,6 +65,7 @@ .Op Fl D Ar destdir .Op Fl L Ar logfile .Op Fl M Ar options +.Op Fl m Ar make .Nm .Cm resolve .Op Fl p @@ -489,6 +492,14 @@ This can be used for to set the or .Dv TARGET_ARCH variables for a cross-build. +.It Fl m Ar make +Use +.Ar make +as the +.Xr make 1 +binary when building a +.Dq current +tree. .It Fl n Enable .Dq dry-run @@ -593,6 +604,14 @@ option. Specify an alternate path for the log file similar to the .Fl L option. +.It Ev MAKE_CMD +Specify the +.Xr make 1 +binary when building a +.Dq current +tree similar to the +.Fl m +option. .It Ev MAKE_OPTIONS Pass additional options to .Xr make 1 diff --git a/usr.sbin/etcupdate/etcupdate.sh b/usr.sbin/etcupdate/etcupdate.sh index 1da8fbf140d9..91417801063d 100755 --- a/usr.sbin/etcupdate/etcupdate.sh +++ b/usr.sbin/etcupdate/etcupdate.sh @@ -64,12 +64,12 @@ usage() cat < + [-m make] etcupdate diff [-d workdir] [-D destdir] [-I patterns] [-L logfile] etcupdate extract [-B] [-d workdir] [-s source | -t tarball] - [-D destdir] [-L logfile] [-M options] + [-D destdir] [-L logfile] [-M options] [-m make] etcupdate resolve [-p] [-d workdir] [-D destdir] [-L logfile] etcupdate revert [-d workdir] [-D destdir] [-L logfile] file ... etcupdate status [-d workdir] [-D destdir] @@ -186,7 +186,7 @@ build_tree() ( local destdir dir file make - make="make $MAKE_OPTIONS -DNO_FILEMON" + make="$MAKE_CMD $MAKE_OPTIONS -DNO_FILEMON" log "Building tree at $1 with $make" @@ -1707,6 +1707,9 @@ ALWAYS_INSTALL= # Files to ignore and never update during a merge. IGNORE_FILES= +# The path to the make binary +MAKE_CMD=make + # Flags to pass to 'make' when building a tree. MAKE_OPTIONS= @@ -1719,6 +1722,7 @@ MAKE_OPTIONS= # - FREEBSD_ID # - IGNORE_FILES # - LOGFILE +# - MAKE_CMD # - MAKE_OPTIONS # - SRCDIR # - WORKDIR @@ -1734,11 +1738,14 @@ dryrun= ignore= nobuild= preworld= -while getopts "d:nprs:t:A:BD:FI:L:M:" option; do +while getopts "d:m:nprs:t:A:BD:FI:L:M:" option; do case "$option" in d) WORKDIR=$OPTARG ;; + m) + MAKE_CMD=$OPTARG + ;; n) dryrun=YES ;;