D53668.1777350043.diff
No OneTemporary
Actions

Size

1013 B

Referenced Files

None

Subscribers

None

D53668.1777350043.diff
View Options

	Index: usr.sbin/bsdinstall/Makefile
	===================================================================
	--- usr.sbin/bsdinstall/Makefile
	+++ usr.sbin/bsdinstall/Makefile
	@@ -15,9 +15,9 @@
	FILESDIR= ${SHAREDIR}/bsdinstall
	FILES= FreeBSD-base.conf

	-_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
	+_BRANCH!= ${MAKE} -C ${SRCTOP}/release -DNO_ROOT -DWITHOUT_QEMU -V BRANCH
	BRANCH?= ${_BRANCH}
	-_REVISION!= ${MAKE} -C ${SRCTOP}/release -V REVISION
	+_REVISION!= ${MAKE} -C ${SRCTOP}/release -DNO_ROOT -DWITHOUT_QEMU -V REVISION
	REVISION?= ${_REVISION}

	.if ${BRANCH} == CURRENT \|\| ${BRANCH} == STABLE
	Index: usr.sbin/pkg/Makefile
	===================================================================
	--- usr.sbin/pkg/Makefile
	+++ usr.sbin/pkg/Makefile
	@@ -1,7 +1,7 @@
	PACKAGE= pkg-bootstrap

	.MAKEFLAGS: -W
	-_BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH
	+_BRANCH!= ${MAKE} -C ${SRCTOP}/release -DNO_ROOT -DWITHOUT_QEMU -V BRANCH
	BRANCH?= ${_BRANCH}
	.if ${BRANCH:MCURRENT} != ""
	PKGCONFBRANCH?= latest