D52624.diff
No OneTemporary
Actions

Size

835 B

Referenced Files

None

Subscribers

None

D52624.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -1992,7 +1992,7 @@

	_pkgbootstrap: .PHONY
	.if make(package) && !exists(${LOCALBASE}/sbin/pkg)
	-.if exists(${PORTSDIR}/ports-mgmt/pkg/Makefile)
	+.if defined(BOOTSTRAP_PKG_FROM_PORTS)
	env - UNAME_r=${UNAME_r} PATH=$$PATH \
	make -C ${PORTSDIR}/ports-mgmt/pkg \
	I_DONT_CARE_IF_MY_BUILDS_TARGET_THE_WRONG_RELEASE=1 \
	diff --git a/release/Makefile b/release/Makefile
	--- a/release/Makefile
	+++ b/release/Makefile
	@@ -195,8 +195,9 @@

	pkgbase-repo:
	mkdir -p pkgbase-repo
	+ mkdir -p /tmp/ports /tmp/distfiles
	( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo \
	- INCLUDE_PKG_IN_PKGBASE_REPO=YES )
	+ INCLUDE_PKG_IN_PKGBASE_REPO=YES BOOTSTRAP_PKG_FROM_PORTS=YES )

	disc1: ${PKGBASE_REPO}
	# Install system