From nobody Tue Apr 18 09:40:33 2023 X-Original-To: freebsd-ports@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q0zS96lxcz44qP2 for ; Tue, 18 Apr 2023 09:40:41 +0000 (UTC) (envelope-from eugen@grosbein.net) Received: from hz.grosbein.net (hz.grosbein.net [IPv6:2a01:4f8:c2c:26d8::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "hz.grosbein.net", Issuer "hz.grosbein.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0zS902J8z4Cjf; Tue, 18 Apr 2023 09:40:40 +0000 (UTC) (envelope-from eugen@grosbein.net) Authentication-Results: mx1.freebsd.org; dkim=none; spf=fail (mx1.freebsd.org: domain of eugen@grosbein.net does not designate 2a01:4f8:c2c:26d8::2 as permitted sender) smtp.mailfrom=eugen@grosbein.net; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=grosbein.net (policy=none) Received: from eg.sd.rdtc.ru (root@eg.sd.rdtc.ru [62.231.161.221] (may be forged)) by hz.grosbein.net (8.17.1/8.17.1) with ESMTPS id 33I9ec9U088635 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 18 Apr 2023 09:40:39 GMT (envelope-from eugen@grosbein.net) X-Envelope-From: eugen@grosbein.net X-Envelope-To: eduardo@freebsd.org Received: from [10.58.0.11] (dadvw [10.58.0.11] (may be forged)) by eg.sd.rdtc.ru (8.16.1/8.16.1) with ESMTPS id 33I9ect4083166 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Tue, 18 Apr 2023 16:40:38 +0700 (+07) (envelope-from eugen@grosbein.net) Subject: Re: Get ${OSREL} at install time To: Nuno Teixeira , FreeBSD Mailing List References: From: Eugene Grosbein Message-ID: Date: Tue, 18 Apr 2023 16:40:33 +0700 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 List-Id: Porting software to FreeBSD List-Archive: https://lists.freebsd.org/archives/freebsd-ports List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports@freebsd.org X-BeenThere: freebsd-ports@freebsd.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT autolearn=disabled version=3.4.6 X-Spam-Report: * -0.0 SHORTCIRCUIT No description available. * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on hz.grosbein.net X-Spamd-Result: default: False [-0.24 / 15.00]; SUBJECT_HAS_CURRENCY(1.00)[]; R_SPF_FAIL(1.00)[-all]; NEURAL_HAM_SHORT(-0.81)[-0.809]; NEURAL_HAM_MEDIUM(-0.72)[-0.715]; NEURAL_HAM_LONG(-0.71)[-0.714]; DMARC_POLICY_SOFTFAIL(0.10)[grosbein.net : No valid SPF, No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; MLMMJ_DEST(0.00)[freebsd-ports@freebsd.org]; TO_DN_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FREEFALL_USER(0.00)[eugen]; RCPT_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4Q0zS902J8z4Cjf X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N 18.04.2023 16:26, Eugene Grosbein wrote: > 18.04.2023 15:05, Nuno Teixeira wrote: >> Hello all, >> >> net/gitup uses a reinplace cmd to setup gitup.conf to the correspondent RELEASE/STABLE for command `gitup release` and `gitup stable`. >> So, if user is using 13.1-RELEASE, reinplace will configure gitup.conf to: >> >> "release" : { >> "branch" : "releng/13.1", >> "stable" : { >> "branch" : "stable/13", >> >> The problem is that OSREL is taken from build time and at this moment 13.2 pkgs are being built on a 13.1 machine. >> So the result is wrong by setting releng/13.1 instead of releng/13.2. >> >> the reinplace cmd is: >> --- >> ${REINPLACE_CMD} -e 's|stable\/12|stable\/${OSREL:R}| ; \ >> s|releng\/11.4|releng\/${OSREL}|' \ >> ${WRKSRC}/gitup.conf >> --- >> >> Any sugestion or example that permits to get OSREL at install time? > > # osrel=$(sysctl -n kern.osrelease) > # echo $osrel ${osrel%%-*} ${osrel%%.*} > 13.2-STABLE 13.2 13 > > And use @postexec command in pkg-plist to run sed instead of REINPLACE_CMD in the Makefile. > Something like this (untested): > > @postexec env osrel=$(sysctl -n kern.osrelease) sed -E -e s,stable/[0-9]+,stable/${osrel\%\%.*}, -e s,releng/[0-9]+,releng/${osrel\%\%-*}, %%PREFIX%%/etc/gitup.conf Jail-friendly replacement is $(freebsd-version -u) instead of (sysctl -n kern.osrelease). "freebsd-version -u" reports version of userland and in case of full jail it may be older than kernel version.