Date: Tue, 22 Mar 2016 21:05:41 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Sean Fagan <sef@ixsystems.com>, Marko Turk <markoml@markoturk.info>, Kris Moore <kris@pcbsd.org> Cc: freebsd-pkgbase@freebsd.org Subject: Re: Missing METALOG Message-ID: <20160322210541.GM58208@FreeBSD.org> In-Reply-To: <08F56E57-F9F4-4C3E-8154-108E5E50E3D0@ixsystems.com> References: <56F169EC.6010400@pcbsd.org> <20160322164814.GJ58208@FreeBSD.org> <56F1979C.7010306@pcbsd.org> <20160322202242.GL58208@FreeBSD.org> <08F56E57-F9F4-4C3E-8154-108E5E50E3D0@ixsystems.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--aSnC4ZPPfhCvD8sN
Content-Type: multipart/mixed; boundary="iUV/lbBrmPtUT9dM"
Content-Disposition: inline
--iUV/lbBrmPtUT9dM
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Tue, Mar 22, 2016 at 01:31:34PM -0700, Sean Fagan wrote:
> On Mar 22, 2016, at 1:22 PM, Glen Barber <gjb@FreeBSD.org> wrote:
> >>>>=20
> > 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?=3D[...]').
> >=20
> > This might be the same reason for the other two reports yesterday.
>=20
> Looks like it. I just did the packages part as root, no DESTDIR, and it =
died differently:
>=20
> [ -L "/home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o ABI_FILE=3D/home/s=
ef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh config ABI)/lates=
t" ] && unlink /home/sef/obj/home/sef/freebsd-pkg/repo/$(pkg -o ABI_FILE=
=3D/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/worldstage/bin/sh config =
ABI)/latest ; pkg -o ABI_FILE=3D/home/sef/obj/home/sef/freebsd-pkg/amd64.a=
md64/worldstage/bin/sh repo -o /home/sef/obj/home/sef/freebsd-pkg/repo/$(p=
kg -o ABI_FILE=3D/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=3D/home/sef/obj/home/sef/freebsd-pkg/amd64.amd64/wo=
rldstage/bin/sh config ABI)/11.0.s20160322202440 ; ln -s /home/sef/obj/h=
ome/sef/freebsd-pkg/repo/$(pkg -o ABI_FILE=3D/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=3D/home/sef/obj/home/se=
f/freebsd-pkg/amd64.amd64/worldstage/bin/sh config ABI)/latest
> pkg: Warning: Major OS version upgrade detected. Running "pkg-static ins=
tall -f pkg" recommended
> pkg: Warning: Major OS version upgrade detected. Running "pkg-static ins=
tall -f pkg" recommended
> pkg: Warning: Major OS version upgrade detected. Running "pkg-static ins=
tall -f pkg" recommended
> pkg: Warning: Major OS version upgrade detected. Running "pkg-static ins=
tall -f pkg" recommended
> pkg: /home/sef/obj/home/sef/freebsd-pkg/repo/FreeBSD:11:amd64/11.0.s20160=
322202440 is not a directory
> Cannot create repository catalogue
>=20
> Now, I do have /home/sef/obj/home/sef/freebsd-pkg/repo/FreeBSD:11:amd64/1=
1.0.s20160317195753, so perhaps I=E2=80=99ll clean everything and start ove=
r, see how that goes.
>=20
Can the three of you please try with r297197 applied (attached for
convenience). In quick evaluation, I believe this should fix this.
Glen
--iUV/lbBrmPtUT9dM
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.inc1.diff.txt"
Content-Transfer-Encoding: quoted-printable
------------------------------------------------------------------------
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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile.inc1 (revision 297196)
+++ Makefile.inc1 (revision 297197)
@@ -1251,9 +1251,9 @@ stagekernel:
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
=20
PORTSDIR?=3D /usr/ports
-WSTAGEDIR=3D ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worlds=
tage
-KSTAGEDIR=3D ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernel=
stage
-REPODIR=3D ${MAKEOBJDIRPREFIX}${.CURDIR}/repo
+WSTAGEDIR?=3D ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/world=
stage
+KSTAGEDIR?=3D ${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kerne=
lstage
+REPODIR?=3D ${MAKEOBJDIRPREFIX}${.CURDIR}/repo
PKGSIGNKEY?=3D # empty
=20
_pkgbootstrap:
------------------------------------------------------------------------
--iUV/lbBrmPtUT9dM--
--aSnC4ZPPfhCvD8sN
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBCAAGBQJW8bOlAAoJEAMUWKVHj+KTs+8P/1ArvuP/X7fS6EtzIrsWNoOK
FJ5gcbcfS2Wsmwwt8JgIHZKw+8r5hguzhG/PT/srB0EA5MKq4ADHfrUwO3jQ/Lyx
0wURR+TpU5+ZXhp1sJqGtjL456vw2erM0HtJ5bGLGDSxTlBoOPb95tZsMi1esmKo
dVzjHrkfa55R22/jMnNgb7D6SfwYEP0Oi84ybkUNrjvK7sRzGDsfTQcCagbZ1RVP
i+C5LVWmuwsnCTt0uz/qbP2GrlzualGtk69al2hoF6c3JqdczPrcKq9RXdBCayK3
fjQY1heOYvaCKpt1TgD4Wm9O1fauqpUvnmhO1xYthz3b52DlgfPmO4it178g0KNq
lZ72QNWH/xzHVGsPiJcn2PJkfuV/x/cWag6HYYp/dcGBNslzTSBDVcgGzOYrM3NR
EKdkiU69TwfBk6Ktxm85YSOjbwJofnjL2NngMtqEeGLn2QZc92TjueTd2kw0pFL0
SIUn2OHiZZU48eFbYPh1Aou+OmpTiL1T+QQNnEu4qHk6gQSCAS3h1Qjg5UF+8t5+
15tQVKmb48skpef3snMVkWTR8f7E6DN1tNVG10UtRl5UfRToitEUWcbWe+zUWlnb
/KWiiO6yNRHLbGicWpP1Wcpapq+d5slKBm1J7/s9hbDbdBqa/tax84qx4O0Q31VU
wZyce519BulElQ060FkA
=VwcY
-----END PGP SIGNATURE-----
--aSnC4ZPPfhCvD8sN--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160322210541.GM58208>