From owner-svn-ports-all@freebsd.org Fri Nov 6 17:20:30 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E280A44448C; Fri, 6 Nov 2020 17:20:30 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CSRwt5qzwz4XHM; Fri, 6 Nov 2020 17:20:30 +0000 (UTC) (envelope-from garga.bsd@gmail.com) Received: by mail-qk1-x733.google.com with SMTP id c27so1728956qko.10; Fri, 06 Nov 2020 09:20:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=RMaOaP1KljWfJgTC4R9UUf34c6ZJ36u/oBAUHrnmN6g=; b=uG91esUeeVE61UTPw5lF7n+SFphc7xlv/9Pv1PRjCTRutadZkmcqTqRhXylWWtL2e9 t9EldZ/+JYEHHoTtCthz3Db7gfebtdS/ORp5aBl+S555ta9U/perlDFD6HvmDqX4UsUW 8U0HohVfySyrvGDMI5xZMVb6nhpSnTGIBegku/djsGMe3np2miEmdntha5+1MK1NtwdQ gpiLVd0o8M/o9BQKwHOvMZGy3mghYiedlzVEXgIYHcyOGHo7qr5IpJrXHFCek0b5QBq3 9pqoZbTPqSK186JV28UZJQdlKQuWLTmSxZmsRDWYX7U6fst9uGuISOir6eT7jcSnpXq0 spxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=RMaOaP1KljWfJgTC4R9UUf34c6ZJ36u/oBAUHrnmN6g=; b=k3/dUqm6dgI4lbe09P+elyHSkem/7oW40WFGKetLoMNAlLHb4nybJFlpzn8s7M5b5l l2S3LVSoyRV3nayws1HIyQsqsh0Zh2zhBob4DrTuim24mYQHpEJDCxIEseSlYVvJsC1S KTHguwAQuGP3TbFiwE6ACMFYcgn0EWhlp1FNsWguCID52r5KqTPkh4SvPu3BA9mAUTEz M9vg49gafMhfH79V8glJEaZgwbcH9IjuzwhhQE1ycO1lWJHqZs1/3brhFmI2Qba+0Cjy bM/7IAWun0d78GnYY0T3/Rgxu+cJDHaMn6wDZbv6udeBHUtm05ug8l7wmduHeWFgvBce iaHQ== X-Gm-Message-State: AOAM532T+x192lu06S/F7PPRxsDRNc/kc45m57pxT9YLBo6nL41upZkc u68Ob7bZScZN11FMuBxGVGHYPxL/UuQ= X-Google-Smtp-Source: ABdhPJwS6OHuEn3tq/TSuPWr+8KnXm2jPhoYEU9pum7ZTyH7dDK+9Iv+JS2pw1NbMeREudcVrQ7w6A== X-Received: by 2002:a37:7fc3:: with SMTP id a186mr2497147qkd.170.1604683229443; Fri, 06 Nov 2020 09:20:29 -0800 (PST) Received: from mbp.home ([2804:f1c:7300:cb00:6c16:78c2:5bfb:11a8]) by smtp.gmail.com with ESMTPSA id d188sm945608qkb.10.2020.11.06.09.20.27 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Nov 2020 09:20:28 -0800 (PST) Sender: Renato Botelho Subject: Re: svn commit: r554143 - head/devel/git To: Guido Falsi , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <202011051704.0A5H4Jf8010250@repo.freebsd.org> <1ef8c98e-49e4-3aff-2886-4991d264ab2f@FreeBSD.org> <24edb45e-1e5a-fe05-30ef-36022e041dc1@FreeBSD.org> <29a040dc-99d4-535e-2be4-14a80a4dd266@FreeBSD.org> <7f621871-62ba-66f2-9917-4553c9bec54e@FreeBSD.org> From: Renato Botelho Message-ID: <7c7655c5-aac0-fe38-9ffb-5ab20ffd1b40@FreeBSD.org> Date: Fri, 6 Nov 2020 14:20:26 -0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <7f621871-62ba-66f2-9917-4553c9bec54e@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4CSRwt5qzwz4XHM X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; TAGGED_FROM(0.00)[]; REPLY(-4.00)[] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Nov 2020 17:20:30 -0000 On 06/11/20 13:24, Guido Falsi wrote: > On 06/11/20 17:01, Renato Botelho wrote: >> On 06/11/20 11:36, Guido Falsi wrote: >>> On 06/11/20 12:41, Renato Botelho wrote: >>>> On 06/11/20 04:22, Guido Falsi wrote: >>>>> On 05/11/20 18:04, Renato Botelho wrote: >>>>>> @@ -76,6 +73,8 @@ OPTIONS_EXCLUDE=    GUI SVN GITWEB CONTRIB P4 >>>>>> CVS PERL >>>>>>   .endif >>>>>>   OPTIONS_SUB=    yes >>>>>> + >>>>>> +OPTIONS_FILE=        ${PORT_DBDIR}/${OPTIONS_NAME}/${FLAVOR}-options >>>>> >>>>> I'm not sure why, but this is not working as expected IMHO. >>>>> >>>>> I noticed that, when using "poudriere options" and building with >>>>> "poudriere bulk" the options file is ignored. poudsriere option >>>>> continuously brings up the git dialog4ports screen and asks options >>>>> proposing the defaults. The option file is correctly written but >>>>> never read. poudriere bulk ignores it and builds with default options. >>>> >>>> I never used `poudriere options` before and indeed it seems to have >>>> a bug there.  For some reason I didn't understand yet poudriere >>>> considers git (with default flavor) as a dependency of git (with >>>> lite or gui flavor) and it's not correct. >>>> >>>> I tested a build with `poudriere testport -c -j JAIL devel/git@lite` >>>> and changed some options.  It worked as expected as you can see at [1]. >>>> >>>>> Also on the local machine running make config repeatedly in the >>>>> port directory does the same: the dialog4ports sscreen comes up >>>>> with default options each time and the options file is written but >>>>> never read. >>>> >>>> I made lots of tests here and everything worked.  The way I did it >>>> was using: >>>> >>>> # make FLAVOR=(lite|gui) [config|showconfig|rmconfig] >>>> >>>> and I couldn't reproduce any issue.  Every time selected options >>>> were respected by showconfig, which reads file saved on config step. >>>> >>> >>> Ok, I Think I see the problem. >>> >>> Did you try doing "make config" without passing any flavor? >>> >>> Ports framework does not define a default flavor for you, so if you >>> don't specify one on the command line in some way, while it works >>> most of the time, with git port it can't work, because the FLAVOR >>> variable is undefined when it gets to expanding it in OPTIONS_FILE. >>> >>> If I run "make config" without a FLAVOR definition it misbehaves. >>> >>> I made a test adding a FLAVOR?= ${FLAVORS:[1]} line just below >>> FLAVORS definition, and it now behaves correctly with "make config". >>> It looks like it still misbehaves with poudriere options though, >>> which is strange, I thought the FLAVOR trick would fix that too. I'm >>> trying to understand why. >>> >> >> Can you try this patch and see if it helps? >> >> https://bast.garga.net.br/files/git_options.diff >> > > Yes, this one fixes the behaviour in ports directory and with poudriere > options. Thanks! Awesome! Committed at r554306. -- Renato Botelho