Date: Sat, 11 Nov 2023 16:26:39 +0000 From: Doug Rabson <dfr@rabson.org> To: pkgbase@freebsd.org Subject: Re: Package version for 14.0-RELEASE Message-ID: <CACA0VUivCQVagjPhBWGxC_uiZ3_EuJ0j=rKS-9hFdi5aFpx0-A@mail.gmail.com> In-Reply-To: <CACA0VUjMQ24Nn7Hb2fmz8QsqbwWviYBjwbv4Sg-E=RhM3_zDhw@mail.gmail.com> References: <CACA0VUjMQ24Nn7Hb2fmz8QsqbwWviYBjwbv4Sg-E=RhM3_zDhw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000076dbfd0609e2e79c Content-Type: text/plain; charset="UTF-8" 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? Doug. --00000000000076dbfd0609e2e79c 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 09:52, 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">I think there is a problem with th= e 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 version= s for 14 don't include the minor revision:<div><br></div><blockquote st= yle=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-run= time-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/Fr= eeBSD:14:amd64/latest/FreeBSD-runtime-14.pkg<br>r</font><br></div></blockqu= ote><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.</di= v><div><br></div><div>I'm not sure if this is a problem but it's ce= rtainly surprising.</div></div></blockquote><div><br></div><div>Comparing 1= 3.2 and 14.0, in 13.2, PKG_VERSION is defined as:</div><div><br></div></div= ><blockquote style=3D"margin:0 0 0 40px;border:none;padding:0px"><div class= =3D"gmail_quote"><div><font face=3D"monospace">PKG_VERSION:=3D =C2=A0 ${_RE= VISION}${EXTRA_REVISION:C/[[:space:]]//g}</font><br></div></div></blockquot= e><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 style=3D"margi= n:0 0 0 40px;border:none;padding:0px"><div><font face=3D"monospace">PKG_VER= SION:=3D =C2=A0 ${MAJOR_REVISION}${EXTRA_REVISION:C/[[:space:]]//g}</font><= br></div></blockquote><div><br></div>where _REVISION is "14.0" an= d MAJOR_REVISION is ${_REVISION:R} which is "14".<div><br></div><= div>Perhaps it should change back?</div><div><br></div><div>Doug.</div><div= ><br><div><div class=3D"gmail_quote"><div>=C2=A0</div></div></div></div></d= iv> --00000000000076dbfd0609e2e79c--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACA0VUivCQVagjPhBWGxC_uiZ3_EuJ0j=rKS-9hFdi5aFpx0-A>