mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-04 15:40:44 +00:00
release: stop generating mergemaster databases
mergemaster was deprecated some time ago and will be removed from FreeBSD 15. Reviewed by: imp Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41797
This commit is contained in:
parent
2a78083fc2
commit
8ee478dfd4
|
@ -118,13 +118,7 @@ clean: beforeclean
|
|||
base.txz:
|
||||
mkdir -p ${DISTDIR}
|
||||
cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${.OBJDIR}/${DISTDIR}
|
||||
# TODO: Add NO_ROOT mode to mm-tree.sh
|
||||
.if !defined(NO_ROOT)
|
||||
# Set up mergemaster root database
|
||||
sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
|
||||
"TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} ${.MAKE.JOBS:D-j${.MAKE.JOBS}}" \
|
||||
-D "${.OBJDIR}/${DISTDIR}/base"
|
||||
.endif
|
||||
# Bootstrap etcupdate(8) database.
|
||||
sh ${WORLDDIR}/usr.sbin/etcupdate/etcupdate.sh extract -B \
|
||||
-m "${MAKE}" -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
|
||||
-s ${WORLDDIR} -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate" \
|
||||
|
|
|
@ -56,14 +56,11 @@ vm_install_base() {
|
|||
installworld installkernel distribution || \
|
||||
err "\n\nCannot install the base system to ${DESTDIR}."
|
||||
|
||||
# Bootstrap etcupdate(8) and mergemaster(8) databases.
|
||||
# Bootstrap etcupdate(8) database.
|
||||
mkdir -p ${DESTDIR}/var/db/etcupdate
|
||||
etcupdate extract -B \
|
||||
-M "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
|
||||
-s ${WORLDDIR} -d ${DESTDIR}/var/db/etcupdate
|
||||
sh ${WORLDDIR}/release/scripts/mm-mtree.sh -m ${WORLDDIR} \
|
||||
-F "TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}" \
|
||||
-D ${DESTDIR}
|
||||
|
||||
echo '# Custom /etc/fstab for FreeBSD VM images' \
|
||||
> ${DESTDIR}/etc/fstab
|
||||
|
|
Loading…
Reference in a new issue