From nobody Wed Nov 2 16:29:56 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 4N2XRh2r3hz4gK8v for ; Wed, 2 Nov 2022 16:30:08 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2XRh2Gx2z3mCr for ; Wed, 2 Nov 2022 16:30:08 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667406608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=uxzv73i1vggnpDUj8leig8GhyTQxiNDPwS0gDzrUAWY=; b=e6C+oM/YmIqs8VeG3c4g2fuSZ0dc7+hs2KYUOfZ4zki6Ywtk56l9G7MdXokCxDaCnrRpi8 MNOa5UYWR41qsB8hDIc9jMIZAwN4dEGJd5UFn04YdvpAG1+DKJTaicP6Le3DQNXnLocQW1 IFR9WoJ9ybbBP10Uy0ll0/6dovwNpaf1FS6ktAA7uOzPmrXivWa0neJiabVJyyf9fgNRfB gPNe5v59tyt8UiNrHcnd7QAfT1yjeO3+3TvTMgEZrp2FLIcF+bnKZMB+xr9msUWbcmtIfS I1GM9Cz4cECPfbQVpOOZxoSAjcLp7Bs4AhFcXgFO9IixcPFsT5qpAyVRJVZDow== Received: from mail-qk1-f178.google.com (mail-qk1-f178.google.com [209.85.222.178]) (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)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 4N2XRh1BHHz1QGF for ; Wed, 2 Nov 2022 16:30:08 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id g10so5541758qkl.6 for ; Wed, 02 Nov 2022 09:30:08 -0700 (PDT) X-Gm-Message-State: ACrzQf3ueSn8G976uMUSJjhCNMmNQj7Mnrw1vCbMaMzyWNw7X+JM4qmp /J3C6y/UzI/mH8pTzRUVbrSXl6XPYobAptVp7Pg= X-Google-Smtp-Source: AMsMyM4uzF1/6/ZvrY07SNcjyWuVz9AGWeft4F87V8aGr4tw32QDKLflOCwzlaHvgtqnJetd5PbGZtxDZSTHP1dh62s= X-Received: by 2002:a05:620a:2186:b0:6fa:1af0:8c77 with SMTP id g6-20020a05620a218600b006fa1af08c77mr15681720qka.554.1667406607790; Wed, 02 Nov 2022 09:30:07 -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: Kyle Evans Date: Wed, 2 Nov 2022 11:29:56 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: New conflict on if_wg.h in runtime package To: Doug Rabson Cc: Guido Falsi , freebsd-pkgbase@freebsd.org Content-Type: text/plain; charset="UTF-8" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667406608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=uxzv73i1vggnpDUj8leig8GhyTQxiNDPwS0gDzrUAWY=; b=PLWf3RAC5RqaLmbC6c3hIGvM3J+t+rbcN5uidY0XruCR78OdB0y9i37AZGn8iJXC3ofwPl HKEQ8Up7yY6dNa6dKSUGF3yedDGkOWkDTsNO7fzDsN/151ZJBVKQ9kspcqJAhMnUR7L7r4 ViUD/By0i5T/WtR3hSI2eiD9+nal+MrdyJUUR/Q5iPIODdkIMGJBzpzw4FUIM6LBrc/J++ BgN9oz9CzjCw+pYKWRorr1Ojm1JPZ2scsoBHc7z+sZJKPrPy1FNu3M1os8nnDJg4SaZlyJ 4TY4dl+ChP5mAl9ipaxu+yRZdJFQgfzPJvAo2rOxZb71MDxkI3k6q4rbHLOZzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667406608; a=rsa-sha256; cv=none; b=Fuxo8tYaDnWTlNPrGQXByXMuboE8hYP6lTAtqfz83cLqHVd+qctxbV7/zdeF8Xfc8fVIph WCTpzvHXXB0Sp1crzDnU5hvJdKqAlpOgaM4ZOBh0hBluK9xTW4cB3AGdzsCyiU1w1Kz1bw e8abvrEekA2dt5t8tvC5HwBrtRNWMBay0Izz1N/AQeydhEX2eNyJM0TF9I+slvVvRWDMDT RF1y79YfLOJrCtlaUQKnp0HDjpnB+cOR5jPmyuROoNBy+Gbde5gKuKmBkQADVrWD/cu3Fn +EJ/mpJRIQO1BE38Ai2gkQflPZ/iQ5ODfcffeHYiKY8PkS0pCc5Hbf/ohPYaNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N 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.