From nobody Tue Apr 18 09:10:57 2023
X-Original-To: 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 4Q0yp61HsMz44nG8
for <ports@mlmmj.nyi.freebsd.org>; Tue, 18 Apr 2023 09:11:10 +0000 (UTC)
(envelope-from eduardo@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
(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 (4096 bits) client-digest SHA256)
(Client CN "smtp.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4Q0yp55qhwz4LSt
for <ports@freebsd.org>; Tue, 18 Apr 2023 09:11:09 +0000 (UTC)
(envelope-from eduardo@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1681809069;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=XEsSKI55FxZT88xmlNr7FIq/CGcx8iQmwCAK5ee1r2I=;
b=SdKYyppzaHbRd4n8IOFHmFX62yrKfV7FcK5tMSZA8r8VQk86f7ysOheIUjECuLvkkS511U
YPoHQg//DwZwaC/ZySZ3uVm8YO1DHs7/JpXrOLwgaJfMC12wFhn/ks8tfOPGMasPm/t1XL
LQaHWJjtcgmXv/B4YGtEAUX8cGXu6QYHnH8klyN+3rO9jWp1ECPEghgSHGjMAQCZUuotEt
ZW3xnsQ6Iyj211+OnZRLAD8Ti8NmPbyKh388kx5Du2OnsGXOtakysd60jvUToTIjHJANsp
f2ImkTqkqq9B6tGz/bMv9KFz3QYUV8Z8IyuHsen4wmPWE0o64JdUq7xrPTrnrA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1681809070;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
in-reply-to:in-reply-to:references:references;
bh=XEsSKI55FxZT88xmlNr7FIq/CGcx8iQmwCAK5ee1r2I=;
b=qsl94Er9EwfJsFJfzam0K+kEIBegzYZs+XQYLoX0tFXPo/83Cko1EBu4WrpZ32ties5VwA
XybBecFElF3J5OC6czJfv6Nvw75GezSckJy7VNecpHuSbIoHKUVCVVB+ZdniXbP1Se1LXa
5PEOkw1Q52krVZQyaMtjDN9gtswO2mrEZ8XPNjGIYkHwmqFIZrs9k2MV+91frOkn/Iqdun
3oOXVRykPk7PVZmPyHrDuead1nJ5Sp3K0bXPg6Dm6jVdLtsWIXZy8D011WaAeL8nKeHmuk
BRzZgPlwXo2Kedc5MXmcaOlfrOz4ZHgzBwlkUKpUBw9tBwTydb4JHZUqPkeFAQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681809070; a=rsa-sha256; cv=none;
b=uRMofN9cZMEBTccc+e5UzIrgdFY5TixnG76ok6iyA8wSy+/5eo4+9e7yNfbTyjLeb6cjai
MUrYc1sszIAyQ4J7m9p0tnwTRqXbh8PR2QVO8pieBD0vomMfPivABR4jCiwKAI2Pm5vW22
0yBUj56HQJvQTwW44vwjr+U0O95TkUfJzyPXWzDLQdqsmmp3u7+usZDBNfTrUfgHugfXcJ
UVvwicVjQQDpeczOFYJT5jgP68ajVZUKglVuFZ9eOfHKwQaROJX+ffutPWrNP2VuSaeQ12
nS0eVM63kDnwmTq/CUGgLuQnrrgN8hsZhjjuXXsx+hZJp1ultEF8KrGKbpfcRA==
Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47])
(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 1D4" (verified OK))
(Authenticated sender: eduardo)
by smtp.freebsd.org (Postfix) with ESMTPSA id 4Q0yp54fR9z10KH
for <ports@freebsd.org>; Tue, 18 Apr 2023 09:11:09 +0000 (UTC)
(envelope-from eduardo@freebsd.org)
Received: by mail-ua1-f47.google.com with SMTP id w19so10111932uad.7
for <ports@freebsd.org>; Tue, 18 Apr 2023 02:11:09 -0700 (PDT)
X-Gm-Message-State: AAQBX9cKrjGrSZWFQbcaUb+eEUkYLGFGzYkLxzRm5xKfMW6ZLnjdiB4M
jFhizQbXdo576EMWXKFXaRnWJanQWGsxmkgODow=
X-Google-Smtp-Source: AKy350Z760TUgaGcfIiIaRbIlSJD7873ZW2aCttm1pKsiZQArSGZ+debqKf433naNL/mHKB1LBqeoI41pn4wkZebcBU=
X-Received: by 2002:a1f:2c03:0:b0:43b:ec02:c2e8 with SMTP id
s3-20020a1f2c03000000b0043bec02c2e8mr9148940vks.3.1681809068900; Tue, 18 Apr
2023 02:11:08 -0700 (PDT)
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/freebsd-ports
List-Help: <mailto:ports+help@freebsd.org>
List-Post: <mailto:ports@freebsd.org>
List-Subscribe: <mailto:ports+subscribe@freebsd.org>
List-Unsubscribe: <mailto:ports+unsubscribe@freebsd.org>
Sender: owner-freebsd-ports@freebsd.org
X-BeenThere: freebsd-ports@freebsd.org
MIME-Version: 1.0
References: <CAFDf7UKJ+Sy0f9xJZ8oc8fcaejhT1LFgjspVTHDt4E99z2sz3w@mail.gmail.com>
<20230418105544.4e4d5a44@daleth.home>
In-Reply-To: <20230418105544.4e4d5a44@daleth.home>
From: Nuno Teixeira <eduardo@freebsd.org>
Date: Tue, 18 Apr 2023 10:10:57 +0100
X-Gmail-Original-Message-ID: <CAFDf7ULeUKBthnLWM_6wgK+VSTpQT2XvNpCOVL+Ay6fQwKqeLw@mail.gmail.com>
Message-ID: <CAFDf7ULeUKBthnLWM_6wgK+VSTpQT2XvNpCOVL+Ay6fQwKqeLw@mail.gmail.com>
Subject: Re: Get ${OSREL} at install time
To: Piotr Smyrak <ps.ports@smyrak.com>
Cc: ports@freebsd.org
Content-Type: multipart/alternative; boundary="00000000000021c9ae05f998b01a"
X-ThisMailContainsUnwantedMimeParts: N
--00000000000021c9ae05f998b01a
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Hello Piotr,
Yes, something like it. I will not need src sys/conf/newvers.sh,
/etc/os-release will do the job.
Thinking right now in a way to check /etc/os-release version at install
time.
Cheers
Piotr Smyrak <ps.ports@smyrak.com> escreveu no dia ter=C3=A7a, 18/04/2023 =
=C3=A0(s)
09:56:
> On Tue, 18 Apr 2023 09:05:36 +0100
> Nuno Teixeira <eduardo@freebsd.org> wrote:
>
> > 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?
>
> Not sure whether I understand your pursuit well, but if you have OS
> source access, you might want to take a look at sys/conf/newvers.sh
>
> $ egrep '^(TYPE|REVISION|BRANCH)' /usr/src/sys/conf/newvers.sh
>
> --
> Piotr Smyrak
>
>
--=20
Nuno Teixeira
FreeBSD Committer (ports)
--00000000000021c9ae05f998b01a
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div>Hello Piotr,</div><div><br></div><div>Yes, something =
like it. I will not need src sys/conf/newvers.sh, /etc/os-release will do t=
he job.</div><div><br></div><div>Thinking right now in a way to check /etc/=
os-release version at install time.</div><div><br></div><div>Cheers <font c=
olor=3D"#888888"><br></font></div></div><br><div class=3D"gmail_quote"><div=
dir=3D"ltr" class=3D"gmail_attr">Piotr Smyrak <<a href=3D"mailto:ps.por=
ts@smyrak.com">ps.ports@smyrak.com</a>> escreveu no dia ter=C3=A7a, 18/0=
4/2023 =C3=A0(s) 09:56:<br></div><blockquote class=3D"gmail_quote" style=3D=
"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-le=
ft:1ex">On Tue, 18 Apr 2023 09:05:36 +0100<br>
Nuno Teixeira <<a href=3D"mailto:eduardo@freebsd.org" target=3D"_blank">=
eduardo@freebsd.org</a>> wrote:<br>
<br>
> net/gitup uses a reinplace cmd to setup gitup.conf to the<br>
> correspondent RELEASE/STABLE for command `gitup release` and `gitup<br=
>
> stable`. So, if user is using 13.1-RELEASE, reinplace will configure<b=
r>
> gitup.conf to:<br>
> <br>
> "release" : {<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"bra=
nch"=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0: "releng/13.1"=
,<br>
> "stable" : {<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0"bra=
nch"=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0: "stable/13",<=
br>
> <br>
> The problem is that OSREL is taken from build time and at this moment<=
br>
> 13.2 pkgs are being built on a 13.1 machine.<br>
> So the result is wrong by setting releng/13.1 instead of releng/13.2.<=
br>
> <br>
> the reinplace cmd is:<br>
> ---<br>
> ${REINPLACE_CMD} -e 's|stable\/12|stable\/${OSREL:R}| ; \<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0s|releng\=
/11.4|releng\/${OSREL}|' \<br>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${WRKSRC}=
/gitup.conf<br>
> ---<br>
> <br>
> Any sugestion or example that permits to get OSREL at install time?<br=
>
<br>
Not sure whether I understand your pursuit well, but if you have OS<br>
source access, you might want to take a look at sys/conf/newvers.sh<br>
<br>
$ egrep '^(TYPE|REVISION|BRANCH)' /usr/src/sys/conf/newvers.sh<br>
<br>
-- <br>
=C2=A0Piotr Smyrak<br>
<br>
</blockquote></div><br clear=3D"all"><br><span class=3D"gmail_signature_pre=
fix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir=3D"l=
tr"><span style=3D"color:rgb(102,102,102)">Nuno Teixeira<br>FreeBSD Committ=
er (ports)</span></div></div>
--00000000000021c9ae05f998b01a--