On Tue, Mar 22, 2016 at 01:31:34PM -0700, Sean Fagan wrote: > On Mar 22, 2016, at 1:22 PM, Glen Barber <[email protected]> wrote: > >>>> > > I think DESTDIR is what is causing the problem for you, but I would need > > more of the build log in order to confirm this. I have kicked a build > > locally, to confirm. I *think* we need to make WSTAGEDIR, KSTAGEDIR, > > and REPODIR overridable (i.e., 'KSTAGEDIR?=[...]'). > > > > This might be the same reason for the other two reports yesterday. > > Looks like it. I just did the packages part as root, no DESTDIR, and it died > differently: > > [ -L "/home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > config ABI)/latest" ] && unlink > /home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > config ABI)/latest ; pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > repo -o /home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > config ABI)/11.0.s20160322202440 > /home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > config ABI)/11.0.s20160322202440 ; ln -s > /home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > config ABI)/11.0.s20160322202440 > /home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o > ABI_FILE=/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh > config ABI)/latest > pkg: Warning: Major OS version upgrade detected. Running "pkg-static install > -f pkg" recommended > pkg: Warning: Major OS version upgrade detected. Running "pkg-static install > -f pkg" recommended > pkg: Warning: Major OS version upgrade detected. Running "pkg-static install > -f pkg" recommended > pkg: Warning: Major OS version upgrade detected. Running "pkg-static install > -f pkg" recommended > pkg: > /home/sef/obj/home/sef/freebsd-pkg/repo/FreeBSD:11:amd64/11.0.s20160322202440 > is not a directory > Cannot create repository catalogue > > Now, I do have > /home/sef/obj/home/sef/freebsd-pkg/repo/FreeBSD:11:amd64/11.0.s20160317195753, > so perhaps I’ll clean everything and start over, see how that goes. >
Can the three of you please try with r297197 applied (attached for convenience). In quick evaluation, I believe this should fix this. Glen
------------------------------------------------------------------------
r297197 | gjb | 2016-03-22 17:02:04 -0400 (Tue, 22 Mar 2016) | 8 lines
Make WSTAGEDIR, KSTAGEDIR, and REPODIR configurable.
This should fix the 'packages' target when MAKEOBJDIRPREFIX or
DESTDIR is set in the make(1) environment or via command line.
Reported by: kmoore, sef, Marko Turk
Sponsored by: The FreeBSD Foundation
Index: Makefile.inc1
===================================================================
--- Makefile.inc1 (revision 297196)
+++ Makefile.inc1 (revision 297197)
@@ -1251,9 +1251,9 @@ stagekernel:
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
PORTSDIR?= /usr/ports
-WSTAGEDIR=
${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
-KSTAGEDIR=
${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
-REPODIR= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo
+WSTAGEDIR?=
${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
+KSTAGEDIR?=
${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
+REPODIR?= ${MAKEOBJDIRPREFIX}${.CURDIR}/repo
PKGSIGNKEY?= # empty
_pkgbootstrap:
------------------------------------------------------------------------
signature.asc
Description: PGP signature
