Date: Mon, 13 Nov 2023 08:43:34 +0000 From: Doug Rabson <dfr@rabson.org> To: pkgbase@freebsd.org Subject: Re: Package version for 14.0-RELEASE Message-ID: <CACA0VUhRv9nqt%2B06dg%2Bz8L-f6rmJdonG0EZ2yVx5_-sv72zLsg@mail.gmail.com> In-Reply-To: <CACA0VUivCQVagjPhBWGxC_uiZ3_EuJ0j=rKS-9hFdi5aFpx0-A@mail.gmail.com> References: <CACA0VUjMQ24Nn7Hb2fmz8QsqbwWviYBjwbv4Sg-E=RhM3_zDhw@mail.gmail.com> <CACA0VUivCQVagjPhBWGxC_uiZ3_EuJ0j=rKS-9hFdi5aFpx0-A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000ff22f4060a04aab1
Content-Type: text/plain; charset="UTF-8"
On Sat, 11 Nov 2023 at 16:26, Doug Rabson <dfr@rabson.org> wrote:
>
>
> On Sat, 11 Nov 2023 at 09:52, Doug Rabson <dfr@rabson.org> wrote:
>
>> I think there is a problem with the pkgbase package versions for
>> 14.0-RELEASE. Looking at my overnight builds and comparing releng/14.0 with
>> releng/13.2, I see that the package versions for 14 don't include the minor
>> revision:
>>
>> # ls -l releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13*
>> -rw-r--r-- 1 root wheel 3485868 Nov 10 22:39
>> releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13.2p5.pkg
>> # ls -l releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-runtime-14*
>> -rw-r--r-- 1 root wheel 3342388 Nov 10 21:54
>> releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-runtime-14.pkg
>> r
>>
>>
>> I think the minor revision gets lost, possibly in the part of
>> release/Makefile that parses out the REVISION variable from newvers.sh.
>>
>> I'm not sure if this is a problem but it's certainly surprising.
>>
>
> Comparing 13.2 and 14.0, in 13.2, PKG_VERSION is defined as:
>
> PKG_VERSION:= ${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
>
>
> where _REVISION is "13.2".
>
> In 14.0, it is:
>
> PKG_VERSION:= ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}
>
>
> where _REVISION is "14.0" and MAJOR_REVISION is ${_REVISION:R} which is
> "14".
>
> Perhaps it should change back?
>
I opened https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=275051 to track
this problem.
--000000000000ff22f4060a04aab1
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
<div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote">=
<div dir=3D"ltr" class=3D"gmail_attr">On Sat, 11 Nov 2023 at 16:26, Doug Ra=
bson <<a href=3D"mailto:dfr@rabson.org">dfr@rabson.org</a>> wrote:<br=
></div><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;=
border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204=
,204);padding-left:1ex"><div dir=3D"ltr"><div dir=3D"ltr"><br></div><br><di=
v class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Sat, 11 No=
v 2023 at 09:52, Doug Rabson <<a href=3D"mailto:dfr@rabson.org" target=
=3D"_blank">dfr@rabson.org</a>> wrote:<br></div><blockquote class=3D"gma=
il_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left-width:1px;border-le=
ft-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div di=
r=3D"ltr">I think there is a problem with the pkgbase package versions for =
14.0-RELEASE. Looking at my overnight builds and comparing releng/14.0 with=
releng/13.2, I see that the package versions for 14 don't include the =
minor revision:<div><br></div><blockquote style=3D"margin:0px 0px 0px 40px;=
border:medium;padding:0px"><div><font face=3D"monospace"># ls -l releng/13.=
2/repo/FreeBSD:13:amd64/latest/FreeBSD-runtime-13*<br>-rw-r--r-- =C2=A01 ro=
ot =C2=A0wheel =C2=A03485868 Nov 10 22:39 releng/13.2/repo/FreeBSD:13:amd64=
/latest/FreeBSD-runtime-13.2p5.pkg<br># ls -l releng/14.0/repo/FreeBSD:14:a=
md64/latest/FreeBSD-runtime-14*<br>-rw-r--r-- =C2=A01 root =C2=A0wheel =C2=
=A03342388 Nov 10 21:54 releng/14.0/repo/FreeBSD:14:amd64/latest/FreeBSD-ru=
ntime-14.pkg<br>r</font><br></div></blockquote><br><div>I think the minor r=
evision gets lost, possibly in the part of release/Makefile that parses out=
the REVISION variable from newvers.sh.</div><div><br></div><div>I'm no=
t sure if this is a problem but it's certainly surprising.</div></div><=
/blockquote><div><br></div><div>Comparing 13.2 and 14.0, in 13.2, PKG_VERSI=
ON is defined as:</div><div><br></div></div><blockquote style=3D"margin:0px=
0px 0px 40px;border:medium;padding:0px"><div class=3D"gmail_quote"><div><f=
ont face=3D"monospace">PKG_VERSION:=3D =C2=A0 ${_REVISION}${EXTRA_REVISION:=
C/[[:space:]]//g}</font><br></div></div></blockquote><div><br></div><div>wh=
ere _REVISION is "13.2".</div><div><br></div><div>In 14.0, it is:=
<br></div><div><br></div><blockquote style=3D"margin:0px 0px 0px 40px;borde=
r:medium;padding:0px"><div><font face=3D"monospace">PKG_VERSION:=3D =C2=A0 =
${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}</font><br></div></block=
quote><div><br></div>where _REVISION is "14.0" and MAJOR_REVISION=
is ${_REVISION:R} which is "14".<div><br></div><div>Perhaps it s=
hould change back?</div></div></blockquote><div><br></div><div>I opened=C2=
=A0<a href=3D"https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D275051">h=
ttps://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D275051</a> to track this=
problem.</div><div><br></div><blockquote class=3D"gmail_quote" style=3D"ma=
rgin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border=
-left-color:rgb(204,204,204);padding-left:1ex">
</blockquote></div></div>
--000000000000ff22f4060a04aab1--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACA0VUhRv9nqt%2B06dg%2Bz8L-f6rmJdonG0EZ2yVx5_-sv72zLsg>