From owner-svn-src-head@freebsd.org Sat May 18 17:13:09 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 113441592E42; Sat, 18 May 2019 17:13:09 +0000 (UTC) (envelope-from brd@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A921689F02; Sat, 18 May 2019 17:13:08 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 837AC22941; Sat, 18 May 2019 17:13:08 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4IHD8Mp026244; Sat, 18 May 2019 17:13:08 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4IHD8ut026243; Sat, 18 May 2019 17:13:08 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201905181713.x4IHD8ut026243@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 18 May 2019 17:13:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r347958 - head/tools/build X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: head/tools/build X-SVN-Commit-Revision: 347958 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A921689F02 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 May 2019 17:13:09 -0000 Author: brd Date: Sat May 18 17:13:08 2019 New Revision: 347958 URL: https://svnweb.freebsd.org/changeset/base/347958 Log: Update beinstall to use the mergemaster/etcupdate from the source tree instead of the installed one. Approved by: will (mentor) Differential Revision: https://reviews.freebsd.org/D20291 Modified: head/tools/build/beinstall.sh Modified: head/tools/build/beinstall.sh ============================================================================== --- head/tools/build/beinstall.sh Sat May 18 16:19:31 2019 (r347957) +++ head/tools/build/beinstall.sh Sat May 18 17:13:08 2019 (r347958) @@ -54,10 +54,6 @@ MERGEMASTER_FLAGS="${MERGEMASTER_FLAGS:-"-iFU"}" ######################################################################## -## Constants -ETCUPDATE_CMD="etcupdate" -MERGEMASTER_CMD="mergemaster" - ## Functions cleanup() { [ -z "${cleanup_commands}" ] && return @@ -126,23 +122,22 @@ create_be_dirs() { } update_mergemaster_pre() { - mergemaster -p -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS} + ${MERGEMASTER_CMD} -p -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS} } update_mergemaster() { - chroot ${BE_MNTPT} \ - mergemaster -m ${srcdir} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS} + ${MERGEMASTER_CMD} -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS} } update_etcupdate_pre() { - etcupdate -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $? - etcupdate resolve -D ${BE_MNTPT} || return $? + ${ETCUPDATE_CMD} -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $? + ${ETCUPDATE_CMD} resolve -D ${BE_MNTPT} || return $? } update_etcupdate() { chroot ${BE_MNTPT} \ - etcupdate -s ${srcdir} ${ETCUPDATE_FLAGS} || return $? - chroot ${BE_MNTPT} etcupdate resolve + ${ETCUPDATE_CMD} -s ${srcdir} ${ETCUPDATE_FLAGS} || return $? + chroot ${BE_MNTPT} ${ETCUPDATE_CMD} resolve } @@ -174,6 +169,10 @@ trap 'errx "Interrupt caught"' HUP INT TERM srcdir=$(pwd) objdir=$(make -V .OBJDIR 2>/dev/null) [ ! -d "${objdir}" ] && errx "Must have built FreeBSD from source tree" + +## Constants +ETCUPDATE_CMD="${srcdir}/usr.sbin/etcupdate/etcupdate.sh" +MERGEMASTER_CMD="${srcdir}/usr.sbin/mergemaster/mergemaster.sh" # May be a worktree, in which case .git is a file, not a directory. if [ -e .git ] ; then