From nobody Wed Nov 2 16:48:42 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 4N2XsL5xMfz4gMFq for ; Wed, 2 Nov 2022 16:48:54 +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 4N2XsL5969z3nSV for ; Wed, 2 Nov 2022 16:48:54 +0000 (UTC) (envelope-from kevans@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667407734; 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=O/19HRomYz99YaZmwajPnzqOc126svUhAHdoyL8jQF4=; b=HUulmN2aD+LAN45BpqRHKMjgiNQbX0tYndhEiWxmlIReOWB8WEARSLZRPrASlIrSM4U0NK D7NeSfRVp5mLdJyZkxDjwaIuo6KXDRSpwDJ8SgwHlfba/GWMTVTPob2k+heBNEkCGW3Pyc tSrEeQif0gtGPeoMO0RR/KakwPHaUAQnGRCwZMDPvR9XtLLc2c2+aeigAOysdPIYXvPEWy nMRuD3pih4Up5qtBfG9HP4eN/FDPfLF7HuBS/i25gcsm47MpkdbsbTpEUi323fr8PA+Jgq CzBuv0vTIZb8s2TOayK5mxk34xQLCW0bQJyuiDGXBOPfA5pPtSqDrtozro8Wcw== 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 4N2XsL3xwjz1QZp for ; Wed, 2 Nov 2022 16:48:54 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f178.google.com with SMTP id s20so5712252qkg.5 for ; Wed, 02 Nov 2022 09:48:54 -0700 (PDT) X-Gm-Message-State: ACrzQf2MzvL5r+PMOMS77fGUFspKdAFi19S/KrlikfWQDFrMLbUlGMLC PyHZGOB0M5qMK9hNMCjzZcL6dpvBJyaH5ylyLlk= X-Google-Smtp-Source: AMsMyM5/paM6Vkd94Xe4TlKiQmKgYRcEi8HjQpiIDkRKw1ONUIo2RU+duN5Jany8fvRNkfioG/ZvVys1DkEkFI1CffA= X-Received: by 2002:a05:620a:372a:b0:6f9:d799:3856 with SMTP id de42-20020a05620a372a00b006f9d7993856mr18738549qkb.730.1667407734178; Wed, 02 Nov 2022 09:48:54 -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:48:42 -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=1667407734; 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=O/19HRomYz99YaZmwajPnzqOc126svUhAHdoyL8jQF4=; b=YuD6VWavgArk4JFBtkSjwHkR/nmKgY+Q8eH0o/HCnw60j7VirVHQkNDk4fUfpXkSNyc1+c jD6H8hpmIhQyS4vdYM9xqAHwjAeGMQqwdny3U0yvyWemy5RqJAO1/1+sXuUyc3lAPrMWnY w4+htNZD2Kg8olSAFtBGNQTb7rPjI2JHGTZUfpFIw7K9Mds/QyNPpM1fjabv4RBUYRZlyM GstBKS98vZ/gEqB2Xgyh6oPzNPETJgwsLYers4ZgGevbJ0McwPhcOMgzNAiCM6IwGp42qt 0tfEYRPrZNUgvm2dTbp3gv7TlBsVTC93+dhNjozJYZv7Ux4pVtMCezMPgjhL6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667407734; a=rsa-sha256; cv=none; b=KaicDXd7IzlLCpXFOtW1YP5oKUg95hS5DS9b/yWHNKdP+FATSMeJVOlsfdIfDF68WA4RQa 9CnZRfC+5cu5NFRPvBKGcjzfoJXtHpAQd91MD/LIZoCAqrvRbsgHQfBpb1sFYXkGawqR/M FSJcRRFTFhWjXqOThH7I6GqSIirhFtNQbg6EFBhy1rP9dvT8rYAJbuHvZ1C6yiwPTF6k/U 7UQOzup4MJ2RVpmD9RmUQDvVm8bMM0WEY7zcxgPDxLCmQicr90HlDne1bVNJWwu+JsIb8j ltLA9evXuxx99XFqVrscXb7zQbCxPIrKcrZrYhSeDUHabSWP2hHY2pQ6kbAvYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N On Wed, Nov 2, 2022 at 11:35 AM Doug Rabson wrote: > > > > 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. > 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.