Date: Sun, 25 Dec 2016 06:08:03 +0000 (UTC) From: jbeich@freebsd.org (Jan Beich) To: rene@freebsd.org, shoesoft@gmx.net Cc: ports@freebsd.org Subject: Re: poudriere ignores stored options after r429298 Message-ID: <20161225060803.8DB1723A9@freefall.freebsd.org> In-Reply-To: <d3c87480-d3ab-e46c-70b2-70a2f24fbe6f@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
René Ladan <rene@freebsd.org> writes: > On 24-12-2016 10:09, Stefan Ehmann wrote: > >> After today's ports update, poudriere ignores all options that were >> previously stored. >> >> Everything works as before after reverting r429298 "Make the ports >> infrastructure accept at least 3 level ports" >> >> Previously, poudriere stored its options for python27 in >> /usr/local/etc/poudriere.d/options/lang_python27 >> >> Now options are stored in >> /usr/local/etc/poudriere.d/options/_usr_ports_lang_python27 > > Hmm, it should still store options in the old directory, or did we > overlook something? Hmm, I don't like risky infra changes landing just before a new quaterly. Can you back it out on 2017Q1? > > From > https://reviews.freebsd.org/file/data/aq3dh3bgietiaksqg764/PHID-FILE-abonf7wbxelwjoqv2aiq/D8889.diff > : > > Old: > -_PORTDIRNAME= ${.CURDIR:T} > -PORTDIRNAME?= ${_PORTDIRNAME} > -PKGORIGIN?= ${PKGCATEGORY}/${PORTDIRNAME} > -OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} > OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options > > New: > +PKGORIGIN?= ${.CURDIR:C/${PORTSDIR}\///} Assuming .CURDIR is under PORTSDIR or using absolute pathname violates POLA. For one, I'm working with multiple forks of the ports tree without adjusting PORTSDIR value as Mk/* bits are same or compatible. While such a workflow isn't recommended it guarantees the same options apply to every tree. > +OPTIONS_NAME?= ${PKGORIGIN:S/\//_/g} > OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options >> root@e17:/usr/local/etc/poudriere.d/options/lang_python27 # ls -l >> total 5 >> -rw-r--r-- 1 root wheel 406 24 dec. 15:32 options > > What do 'make -V PKGORIGIN' and 'make -V OPTIONS_NAME' tell? Perhaps, poudriere invoked |make config| outside of jail where PORTSDIR has a different value.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20161225060803.8DB1723A9>