Date: Tue, 14 Nov 2023 10:08:59 +0000 From: Doug Rabson <dfr@rabson.org> To: pkgbase@freebsd.org Cc: re <re@freebsd.org> Subject: Re: Package version for 14.0-RELEASE Message-ID: <CACA0VUiZJGUUOyN-%2BvM5i%2BrCH6AeoG=WOMFNkiXhrZcqi=ZBgA@mail.gmail.com> In-Reply-To: <CACA0VUhRv9nqt%2B06dg%2Bz8L-f6rmJdonG0EZ2yVx5_-sv72zLsg@mail.gmail.com> References: <CACA0VUjMQ24Nn7Hb2fmz8QsqbwWviYBjwbv4Sg-E=RhM3_zDhw@mail.gmail.com> <CACA0VUivCQVagjPhBWGxC_uiZ3_EuJ0j=rKS-9hFdi5aFpx0-A@mail.gmail.com> <CACA0VUhRv9nqt%2B06dg%2Bz8L-f6rmJdonG0EZ2yVx5_-sv72zLsg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--0000000000004d7d4b060a19fa15 Content-Type: text/plain; charset="UTF-8" On Mon, 13 Nov 2023 at 08:43, Doug Rabson <dfr@rabson.org> wrote: > > > 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. > I think we should consider this for a FreeBSD 14.0 errata so that packages built for 14.0-RELEASE-p1 and later can have the correct version numbers. I've started drafting an errata notice and I will merge the fix to stable/14 before the end of this week. Doug. --0000000000004d7d4b060a19fa15 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><br></div><div class=3D"gmail_quote"><div= dir=3D"ltr" class=3D"gmail_attr">On Mon, 13 Nov 2023 at 08:43, Doug Rabson= <<a href=3D"mailto:dfr@rabson.org">dfr@rabson.org</a>> wrote:<br></d= iv><blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;bord= er-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><div cl= ass=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Sat, 11 Nov 20= 23 at 16:26, Doug Rabson <<a href=3D"mailto:dfr@rabson.org" target=3D"_b= lank">dfr@rabson.org</a>> wrote:<br></div><blockquote class=3D"gmail_quo= te" style=3D"margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-sty= le:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div dir=3D"l= tr"><div dir=3D"ltr"><br></div><br><div class=3D"gmail_quote"><div dir=3D"l= tr" class=3D"gmail_attr">On Sat, 11 Nov 2023 at 09:52, Doug Rabson <<a h= ref=3D"mailto:dfr@rabson.org" target=3D"_blank">dfr@rabson.org</a>> wrot= e:<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(20= 4,204,204);padding-left:1ex"><div dir=3D"ltr">I think there is a problem wi= th the pkgbase package versions for 14.0-RELEASE. Looking at my overnight b= uilds and comparing releng/14.0 with releng/13.2, I see that the package ve= rsions for 14 don't include the minor revision:<div><br></div><blockquo= te style=3D"margin:0px 0px 0px 40px;border:medium;padding:0px"><div><font f= ace=3D"monospace"># ls -l releng/13.2/repo/FreeBSD:13:amd64/latest/FreeBSD-= runtime-13*<br>-rw-r--r-- =C2=A01 root =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:amd64/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-runtime-14.pkg<br>r</font><br></div></bloc= kquote><br><div>I think the minor revision 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 not sure if this is a problem but it's= certainly surprising.</div></div></blockquote><div><br></div><div>Comparin= g 13.2 and 14.0, in 13.2, PKG_VERSION 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><font face=3D"monospace">PKG_VERSION:=3D = =C2=A0 ${_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}</font><br></div></div= ></blockquote><div><br></div><div>where _REVISION is "13.2".</div= ><div><br></div><div>In 14.0, it is:<br></div><div><br></div><blockquote st= yle=3D"margin:0px 0px 0px 40px;border:medium;padding:0px"><div><font face= =3D"monospace">PKG_VERSION:=3D =C2=A0 ${MAJOR_REVISION}${EXTRA_REVISION:C/[= [:space:]]//g}</font><br></div></blockquote><div><br></div>where _REVISION = is "14.0" and MAJOR_REVISION is ${_REVISION:R} which is "14&= quot;.<div><br></div><div>Perhaps it should change back?</div></div></block= quote><div><br></div><div>I opened=C2=A0<a href=3D"https://bugs.freebsd.org= /bugzilla/show_bug.cgi?id=3D275051" target=3D"_blank">https://bugs.freebsd.= org/bugzilla/show_bug.cgi?id=3D275051</a> to track this problem.</div></div= ></div></blockquote><div><br></div><div>I think we should consider this for= a FreeBSD 14.0 errata so that packages built for 14.0-RELEASE-p1 and later= can have the correct version numbers. I've started drafting an errata = notice and I will merge the fix to stable/14 before the end of this week.</= div><div><br></div><div>Doug.</div><div>=C2=A0</div></div></div> --0000000000004d7d4b060a19fa15--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACA0VUiZJGUUOyN-%2BvM5i%2BrCH6AeoG=WOMFNkiXhrZcqi=ZBgA>