d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update beinstall to use the mergemaster/etcupdate from the source tree instead

Browse Source 
of the installed one.

Approved by:	will (mentor)
Differential Revision:	https://reviews.freebsd.org/D20291
This commit is contained in:
brd 2019-05-18 17:13:08 +00:00
parent fd1567d781
commit 6ddc0bb9bc
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/build/beinstall.sh
View File

@ -54,10 +54,6 @@ MERGEMASTER_FLAGS="${MERGEMASTER_FLAGS:-"-iFU"}"
######################################################################## ########################################################################
## Constants
ETCUPDATE_CMD="etcupdate"
MERGEMASTER_CMD="mergemaster"
## Functions ## Functions
cleanup() { cleanup() {
[ -z "${cleanup_commands}" ] && return [ -z "${cleanup_commands}" ] && return
@ -126,23 +122,22 @@ create_be_dirs() {
} }
update_mergemaster_pre() { 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() { update_mergemaster() {
chroot ${BE_MNTPT} \ ${MERGEMASTER_CMD} -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
mergemaster -m ${srcdir} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
} }
update_etcupdate_pre() { update_etcupdate_pre() {
etcupdate -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $? ${ETCUPDATE_CMD} -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
etcupdate resolve -D ${BE_MNTPT} || return $? ${ETCUPDATE_CMD} resolve -D ${BE_MNTPT} || return $?
} }
update_etcupdate() { update_etcupdate() {
chroot ${BE_MNTPT} \ chroot ${BE_MNTPT} \
etcupdate -s ${srcdir} ${ETCUPDATE_FLAGS} || return $? ${ETCUPDATE_CMD} -s ${srcdir} ${ETCUPDATE_FLAGS} || return $?
chroot ${BE_MNTPT} etcupdate resolve chroot ${BE_MNTPT} ${ETCUPDATE_CMD} resolve
} }
@ -175,6 +170,10 @@ srcdir=$(pwd)
objdir=$(make -V .OBJDIR 2>/dev/null) objdir=$(make -V .OBJDIR 2>/dev/null)
[ ! -d "${objdir}" ] && errx "Must have built FreeBSD from source tree" [ ! -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. # May be a worktree, in which case .git is a file, not a directory.
if [ -e .git ] ; then if [ -e .git ] ; then
commit_time=$(git show --format='%ct' 2>/dev/null | head -1) commit_time=$(git show --format='%ct' 2>/dev/null | head -1)