From nobody Wed Nov 02 16:35:28 2022 X-Original-To: freebsd-pkgbase@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N2XZ46R5kz4gKpP for ; Wed, 2 Nov 2022 16:35:40 +0000 (UTC) (envelope-from dfr@rabson.org) Received: from mail-vs1-xe2f.google.com (mail-vs1-xe2f.google.com [IPv6:2607:f8b0:4864:20::e2f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2XZ40lLMz3n2B for ; Wed, 2 Nov 2022 16:35:40 +0000 (UTC) (envelope-from dfr@rabson.org) Received: by mail-vs1-xe2f.google.com with SMTP id t5so9750093vsh.8 for ; Wed, 02 Nov 2022 09:35:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rabson-org.20210112.gappssmtp.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=IQzdHNJZIdNGMoDQJkNbNIV3+dsCeACNo86Nz+LKy40=; b=QRdbYnEaBdbhKBITJSScLuTA9kp/pIB76sOvOxKv0QeOeCNrRomxiIYrjfCWCPVWrI EVtWapHeW38Bxp06Ur2N4Iq41FO0CdW6yf1qrsQKrCnzTJcySR7o5dKJpQP3M3dOm4eM i6tK7LDoVd9Tk8EFVQfIJheSv0cwjqQbQNncw4+u4EjL+Uku+LOZtSwt8ZW5xe8oP7gQ YQjfBVMhuYKYpjTc+EYbOJ49/Mlc0YK2WhMHo444LChvsHo8TRjiQ6dTecOdNvZr88BV J0ohFmv5fh1H/AmP2bm+fiFli6KCsJLzvvk0H02SAgG9myPt/Oc2lAgIaxa1sZrRsBMt Qh3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IQzdHNJZIdNGMoDQJkNbNIV3+dsCeACNo86Nz+LKy40=; b=1gwY3H5Ob/zjjDQsLw7OZoslK3tPWBJ3PAwdqhrU1gjjv52N7GyHUI75ujOrw1K1/e uesxR1Wqt83MiXqPlfyiLh8hXyKgCuI9KL0u9SbhJGBgGBVF3+A3DabFwriQ8aGqquVf 8zTy+k8VExkV4kkl9RUB7LWpIpdyieNHIjUxuksVQZd15DrN8C1NFIzmgU9xs+W5ZmFT 1zFuD4DqBJ9PS8m9INbBy8WcBfQm6VVjkhdYBb0GLT4Q7YrtbuelXQrUigFMlD4KRLgx M8Ghi0LUIUo7aQNwFqQyQyCs6bPM5iP7DGNcMQC+V1396C6JmtyDDbQy8QdgANYk2iH9 JHkQ== X-Gm-Message-State: ACrzQf2y6DcJOQb2umGAAiLzv4oyZzroG5eV+wWpU6vGTTDkP5sIkhBC CqcUW9EyDLG/RcvnBGncecSmHTBhvulqphy5dLbQc1V20m8= X-Google-Smtp-Source: AMsMyM74aNlU1hmNxnIJck4BpLX4Ij4mLvwmcCNOfWDCX/zO2akry9WqGTGb0bAihqC0b/TNnZDhOln0WD2Pd1z4ia0= X-Received: by 2002:a67:dc0b:0:b0:3aa:304f:54bc with SMTP id x11-20020a67dc0b000000b003aa304f54bcmr12317109vsj.76.1667406939401; Wed, 02 Nov 2022 09:35:39 -0700 (PDT) List-Id: Packaging the FreeBSD base system List-Archive: https://lists.freebsd.org/archives/freebsd-pkgbase List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-pkgbase@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Doug Rabson Date: Wed, 2 Nov 2022 16:35:28 +0000 Message-ID: Subject: Re: New conflict on if_wg.h in runtime package To: Kyle Evans Cc: Guido Falsi , freebsd-pkgbase@freebsd.org Content-Type: multipart/alternative; boundary="00000000000051c55d05ec7f6ec4" X-Rspamd-Queue-Id: 4N2XZ40lLMz3n2B X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=rabson-org.20210112.gappssmtp.com header.s=20210112 header.b=QRdbYnEa; dmarc=none; spf=pass (mx1.freebsd.org: domain of dfr@rabson.org designates 2607:f8b0:4864:20::e2f as permitted sender) smtp.mailfrom=dfr@rabson.org X-Spamd-Result: default: False [-3.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; R_DKIM_ALLOW(-0.20)[rabson-org.20210112.gappssmtp.com:s=20210112]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::e2f:from]; ARC_NA(0.00)[]; MLMMJ_DEST(0.00)[freebsd-pkgbase@freebsd.org]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; DKIM_TRACE(0.00)[rabson-org.20210112.gappssmtp.com:+]; DMARC_NA(0.00)[rabson.org]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[dfr]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; PREVIOUSLY_DELIVERED(0.00)[freebsd-pkgbase@freebsd.org]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N --00000000000051c55d05ec7f6ec4 Content-Type: text/plain; charset="UTF-8" On Wed, 2 Nov 2022 at 16:30, Kyle Evans wrote: > On Wed, Nov 2, 2022 at 11:21 AM Doug Rabson wrote: > > > > > > > > On Wed, 2 Nov 2022 at 16:07, Guido Falsi wrote: > >> > >> On 02/11/22 16:32, Doug Rabson wrote: > >> > > >> > > >> > On Wed, 2 Nov 2022 at 13:54, Guido Falsi >> > > 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 ? > >> > > >> > > >> > >> > >> 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


=
On Wed, 2 Nov 2022 at 16:30, Kyle Eva= ns <kevans@freebsd.org> wro= te:
On Wed, Nov 2, 2022 at 11:21 AM Doug Rabson &= lt;dfr@rabson.org&g= t; 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:
>> >
>> >=C2=A0 =C2=A0 =C2=A0Hi!
>> >
>> >=C2=A0 =C2=A0 =C2=A0I am trying to upgrade head using packaged= base and I'm getting this
>> >=C2=A0 =C2=A0 =C2=A0error now:
>> >
>> >=C2=A0 =C2=A0 =C2=A0pkg: FreeBSD-runtime-dev-14.snap2022110209= 5743 conflicts with
>> >=C2=A0 =C2=A0 =C2=A0FreeBSD-runtime-14.snap20221102095743 (ins= talls files into the same
>> >=C2=A0 =C2=A0 =C2=A0place).=C2=A0 Problematic file: /usr/inclu= de/dev/wg/if_wg.h
>> >
>> >=C2=A0 =C2=A0 =C2=A0Looks like for some reason if_wg.h ended u= p in both packages.
>> >
>> >=C2=A0 =C2=A0 =C2=A0Am I doing something wrong and can I work = around this or should this be
>> >=C2=A0 =C2=A0 =C2=A0fixed in the sources?
>> >
>> >
>> > This seems to be a problem in pkgbase. Packages are built usi= ng the
>> > metalog generated from the various install commands during th= e build -
>> > if_wg.h has two entries in the metalog, one with
>> > tags=3Dpackage=3Druntime,dev and one with tags=3Dpackage=3Dru= ntime. 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/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.
>>

It's via ${INSTALL}, which uses ${INSTALLFLAGS} that includes metalog 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
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.=C2=A0
<= /div>
--00000000000051c55d05ec7f6ec4--