D52623.1789910112.diff
No OneTemporary
Actions

Size

977 B

Referenced Files

None

Subscribers

None

D52623.1789910112.diff
View Options

	diff --git a/Makefile.inc1 b/Makefile.inc1
	--- a/Makefile.inc1
	+++ b/Makefile.inc1
	@@ -2047,6 +2047,7 @@
	${_+_}${MAKE} -C ${.CURDIR} ${PKGMAKEARGS} real-update-packages

	package-pkg: _pkgbootstrap _repodir .PHONY
	+.if defined(INCLUDE_PKG_IN_PKGBASE_REPO)
	.if exists(${PORTSDIR})
	rm -rf /tmp/ports.${TARGET} \|\| :
	env ${WMAKEENV} SRCDIR=${.CURDIR} PORTSDIR=${PORTSDIR} REVISION=${_REVISION} \
	@@ -2055,6 +2056,7 @@
	OSVERSION="${SRCRELDATE}" \
	sh ${.CURDIR}/release/scripts/make-pkg-package.sh
	.endif
	+.endif

	real-packages: stage-packages create-packages sign-packages .PHONY

	diff --git a/release/Makefile b/release/Makefile
	--- a/release/Makefile
	+++ b/release/Makefile
	@@ -195,7 +195,8 @@

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

	disc1: ${PKGBASE_REPO}
	# Install system