From owner-freebsd-ports@freebsd.org  Sun Dec 25 06:08:04 2016
Return-Path: <owner-freebsd-ports@freebsd.org>
Delivered-To: freebsd-ports@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80E50C8ED5B
 for <freebsd-ports@mailman.ysv.freebsd.org>;
 Sun, 25 Dec 2016 06:08:04 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org
 [IPv6:2001:1900:2254:206a::50:5])
 by mx1.freebsd.org (Postfix) with ESMTP id 71CF01D6E
 for <freebsd-ports@freebsd.org>; Sun, 25 Dec 2016 06:08:04 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by mailman.ysv.freebsd.org (Postfix)
 id 6DDBEC8ED5A; Sun, 25 Dec 2016 06:08:04 +0000 (UTC)
Delivered-To: ports@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6B509C8ED59
 for <ports@mailman.ysv.freebsd.org>; Sun, 25 Dec 2016 06:08:04 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2610:1c1:1:6074::16:84])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 451581D6D;
 Sun, 25 Dec 2016 06:08:04 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id 8DB1723A9; Sun, 25 Dec 2016 06:08:03 +0000 (UTC)
To: rene@freebsd.org, shoesoft@gmx.net
Subject: Re: poudriere ignores stored options after r429298
Cc: ports@freebsd.org
In-Reply-To: <d3c87480-d3ab-e46c-70b2-70a2f24fbe6f@freebsd.org>
Message-Id: <20161225060803.8DB1723A9@freefall.freebsd.org>
Date: Sun, 25 Dec 2016 06:08:03 +0000 (UTC)
From: jbeich@freebsd.org (Jan Beich)
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Dec 2016 06:08:04 -0000

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.