Date: Wed, 2 Nov 2022 16:59:32 +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: <CACA0VUjRvsy6MCJWcFo_k-_vv0F_3kRnADmxXSaw2GRT22c0pw@mail.gmail.com> In-Reply-To: <CACNAnaEO0Ys-YMQ6rqv7_8etWJgxBTfC7T_aLZ_zHu3vYYxqEw@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> <CACA0VUhaTJQX8FjL3gc9U7U2k62vZa%2BrGtMkKm=YWoAX_oWWHA@mail.gmail.com> <CACNAnaEO0Ys-YMQ6rqv7_8etWJgxBTfC7T_aLZ_zHu3vYYxqEw@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Wed, 2 Nov 2022 at 16:48, Kyle Evans <kevans@freebsd.org> wrote: > On Wed, Nov 2, 2022 at 11:35 AM Doug Rabson <dfr@rabson.org> wrote: > > > > > > > > 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. > > > > I think the end-result is that we actually *only* want the entries > from the copies (or symlinks) targets so that we preserve the final > state, even though it's pretty much just going to be copies for most > people. We just need to restructure those to more surgically operate > on INCS/INCSGROUPS. > Is that something you have time to work on? I am very far from understanding how this stuff works :( [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><br></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, 2 Nov 2022 at 16:48, Kyle Evans <<a href="mailto:kevans@freebsd.org">kevans@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">On Wed, Nov 2, 2022 at 11:35 AM Doug Rabson <<a href="mailto:dfr@rabson.org" target="_blank">dfr@rabson.org</a>> wrote:<br> ><br> ><br> ><br> > On Wed, 2 Nov 2022 at 16:30, Kyle Evans <<a href="mailto:kevans@freebsd.org" target="_blank">kevans@freebsd.org</a>> wrote:<br> >><br> >> On Wed, Nov 2, 2022 at 11:21 AM Doug Rabson <<a href="mailto:dfr@rabson.org" target="_blank">dfr@rabson.org</a>> wrote:<br> >> ><br> >> ><br> >> ><br> >> > On Wed, 2 Nov 2022 at 16:07, Guido Falsi <<a href="mailto:mad@madpilot.net" target="_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="mailto:mad@madpilot.net" target="_blank">mad@madpilot.net</a><br> >> >> > <mailto:<a href="mailto:mad@madpilot.net" target="_blank">mad@madpilot.net</a>>> wrote:<br> >> >> ><br> >> >> > Hi!<br> >> >> ><br> >> >> > I am trying to upgrade head using packaged base and I'm getting this<br> >> >> > error now:<br> >> >> ><br> >> >> > pkg: FreeBSD-runtime-dev-14.snap20221102095743 conflicts with<br> >> >> > FreeBSD-runtime-14.snap20221102095743 (installs files into the same<br> >> >> > place). Problematic file: /usr/include/dev/wg/if_wg.h<br> >> >> ><br> >> >> > Looks like for some reason if_wg.h ended up in both packages.<br> >> >> ><br> >> >> > Am I doing something wrong and can I work around this or should this be<br> >> >> > fixed in the sources?<br> >> >> ><br> >> >> ><br> >> >> > This seems to be a problem in pkgbase. Packages are built using the<br> >> >> > metalog generated from the various install commands during the build -<br> >> >> > if_wg.h has two entries in the metalog, one with<br> >> >> > tags=package=runtime,dev and one with tags=package=runtime. Can you open<br> >> >> > a bug on <a href="http://bugs.freebsd.org" rel="noreferrer" target="_blank">bugs.freebsd.org</a> <<a href="http://bugs.freebsd.org" rel="noreferrer" target="_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/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.<br> >> >><br> >><br> >> It's via ${INSTALL}, which uses ${INSTALLFLAGS} that includes metalog<br> >> 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> ><br> > That makes sense - for if_wg.h, there is an explicit entry in the WG group which does get installed with ,dev.<br> ><br> <br> I think the end-result is that we actually *only* want the entries<br> from the copies (or symlinks) targets so that we preserve the final<br> state, even though it's pretty much just going to be copies for most<br> people. We just need to restructure those to more surgically operate<br> on INCS/INCSGROUPS.<br></blockquote><div><br></div><div>Is that something you have time to work on? I am very far from understanding how this stuff works :(</div><div><br></div></div></div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACA0VUjRvsy6MCJWcFo_k-_vv0F_3kRnADmxXSaw2GRT22c0pw>