Date: Wed, 2 Nov 2022 16:35:28 +0000 From: Doug Rabson <dfr@rabson.org> To: Kyle Evans <kevans@freebsd.org> Cc: Guido Falsi <mad@madpilot.net>, freebsd-pkgbase@freebsd.org Subject: Re: New conflict on if_wg.h in runtime package Message-ID: <CACA0VUhaTJQX8FjL3gc9U7U2k62vZa%2BrGtMkKm=YWoAX_oWWHA@mail.gmail.com> In-Reply-To: <CACNAnaHW%2Bn2ZjZZsQmknxSAXcp4a=xdsCEhR5L0fRUOw8gFwrA@mail.gmail.com> References: <edc66854-7f9e-9383-643a-7ffb76b60890@madpilot.net> <CACA0VUiU8zvWgiwcUs8-sg6PmcQiMGGu-1v8j0HBGQPj2_VFzA@mail.gmail.com> <c1e4cdb7-51b0-7a6b-7ada-fd22cb8d94f7@madpilot.net> <CACA0VUhU2NjaU=tJhvXqcrO0%2BBcgSA_cGrkeYTy3upKzucw1uQ@mail.gmail.com> <CACNAnaHW%2Bn2ZjZZsQmknxSAXcp4a=xdsCEhR5L0fRUOw8gFwrA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--00000000000051c55d05ec7f6ec4 Content-Type: text/plain; charset="UTF-8" On Wed, 2 Nov 2022 at 16:30, Kyle Evans <kevans@freebsd.org> wrote: > On Wed, Nov 2, 2022 at 11:21 AM Doug Rabson <dfr@rabson.org> wrote: > > > > > > > > On Wed, 2 Nov 2022 at 16:07, Guido Falsi <mad@madpilot.net> wrote: > >> > >> On 02/11/22 16:32, Doug Rabson wrote: > >> > > >> > > >> > On Wed, 2 Nov 2022 at 13:54, Guido Falsi <mad@madpilot.net > >> > <mailto:mad@madpilot.net>> wrote: > >> > > >> > Hi! > >> > > >> > I am trying to upgrade head using packaged base and I'm getting > this > >> > error now: > >> > > >> > pkg: FreeBSD-runtime-dev-14.snap20221102095743 conflicts with > >> > FreeBSD-runtime-14.snap20221102095743 (installs files into the > same > >> > place). Problematic file: /usr/include/dev/wg/if_wg.h > >> > > >> > Looks like for some reason if_wg.h ended up in both packages. > >> > > >> > Am I doing something wrong and can I work around this or should > this be > >> > fixed in the sources? > >> > > >> > > >> > This seems to be a problem in pkgbase. Packages are built using the > >> > metalog generated from the various install commands during the build - > >> > if_wg.h has two entries in the metalog, one with > >> > tags=package=runtime,dev and one with tags=package=runtime. Can you > open > >> > a bug on bugs.freebsd.org <http://bugs.freebsd.org>? > >> > > >> > > >> > >> > >> sure! > > > > > > I think the problem is caused by the 'copies' target in src/include > which is where the second metalog entry happens. From my limited > understanding, this target shouldn't create metalog entries but I'm not > sure how to stop it. > >> > > It's via ${INSTALL}, which uses ${INSTALLFLAGS} that includes metalog > bits. The problem is we're using the global ${TAG_ARGS} for those, but > that's wrong on a number of levels. All of the headers need, at a > minimum, a version of ${TAG_ARGS} that has ,dev, but also a lot of > these have their own *PACKAGE that they should go to instead. > That makes sense - for if_wg.h, there is an explicit entry in the WG group which does get installed with ,dev. --00000000000051c55d05ec7f6ec4 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 Wed, 2 Nov 2022 at 16:30, Kyle Eva= ns <<a href=3D"mailto:kevans@freebsd.org">kevans@freebsd.org</a>> wro= te:<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(2= 04,204,204);padding-left:1ex">On Wed, Nov 2, 2022 at 11:21 AM Doug Rabson &= lt;<a href=3D"mailto:dfr@rabson.org" target=3D"_blank">dfr@rabson.org</a>&g= t; wrote:<br> ><br> ><br> ><br> > On Wed, 2 Nov 2022 at 16:07, Guido Falsi <<a href=3D"mailto:mad@mad= pilot.net" target=3D"_blank">mad@madpilot.net</a>> wrote:<br> >><br> >> On 02/11/22 16:32, Doug Rabson wrote:<br> >> ><br> >> ><br> >> > On Wed, 2 Nov 2022 at 13:54, Guido Falsi <<a href=3D"mailt= o:mad@madpilot.net" target=3D"_blank">mad@madpilot.net</a><br> >> > <mailto:<a href=3D"mailto:mad@madpilot.net" target=3D"_bla= nk">mad@madpilot.net</a>>> wrote:<br> >> ><br> >> >=C2=A0 =C2=A0 =C2=A0Hi!<br> >> ><br> >> >=C2=A0 =C2=A0 =C2=A0I am trying to upgrade head using packaged= base and I'm getting this<br> >> >=C2=A0 =C2=A0 =C2=A0error now:<br> >> ><br> >> >=C2=A0 =C2=A0 =C2=A0pkg: FreeBSD-runtime-dev-14.snap2022110209= 5743 conflicts with<br> >> >=C2=A0 =C2=A0 =C2=A0FreeBSD-runtime-14.snap20221102095743 (ins= talls files into the same<br> >> >=C2=A0 =C2=A0 =C2=A0place).=C2=A0 Problematic file: /usr/inclu= de/dev/wg/if_wg.h<br> >> ><br> >> >=C2=A0 =C2=A0 =C2=A0Looks like for some reason if_wg.h ended u= p in both packages.<br> >> ><br> >> >=C2=A0 =C2=A0 =C2=A0Am I doing something wrong and can I work = around this or should this be<br> >> >=C2=A0 =C2=A0 =C2=A0fixed in the sources?<br> >> ><br> >> ><br> >> > This seems to be a problem in pkgbase. Packages are built usi= ng the<br> >> > metalog generated from the various install commands during th= e build -<br> >> > if_wg.h has two entries in the metalog, one with<br> >> > tags=3Dpackage=3Druntime,dev and one with tags=3Dpackage=3Dru= ntime. Can you open<br> >> > a bug on <a href=3D"http://bugs.freebsd.org" rel=3D"noreferre= r" target=3D"_blank">bugs.freebsd.org</a> <<a href=3D"http://bugs.freebs= d.org" rel=3D"noreferrer" target=3D"_blank">http://bugs.freebsd.org</a>>= ?<br> >> ><br> >> ><br> >><br> >><br> >> sure!<br> ><br> ><br> > I think the problem is caused by the 'copies' target in src/in= clude which is where the second metalog entry happens. From my limited unde= rstanding, this target shouldn't create metalog entries but I'm not= sure how to stop it.<br> >><br> <br> It's via ${INSTALL}, which uses ${INSTALLFLAGS} that includes metalog<b= r> bits. The problem is we're using the global ${TAG_ARGS} for those, but<= br> that's wrong on a number of levels. All of the headers need, at a<br> minimum, a version of ${TAG_ARGS} that has ,dev, but also a lot of<br> these have their own *PACKAGE that they should go to instead.<br></blockquo= te><div><br></div><div>That makes sense - for if_wg.h, there is an explicit= entry in the WG group which does get installed with ,dev.=C2=A0<br></div><= /div></div> --00000000000051c55d05ec7f6ec4--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACA0VUhaTJQX8FjL3gc9U7U2k62vZa%2BrGtMkKm=YWoAX_oWWHA>