From nobody Sun Nov 13 05:40:48 2022 X-Original-To: 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 4N91WP1xvGz4d806 for ; Sun, 13 Nov 2022 05:40:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N91WP0scmz3LbQ for ; Sun, 13 Nov 2022 05:40:49 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668318049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U3uPOBau5Q54nHRFE5vkhaCRShMe4+27k7YD9FZPDhk=; b=Z53RQqg0vjvS5HMf8tUAJlWN9iLNH/yE3h1lHN3+rV+UnT5WhFdrX86BOAbci4SnFuSNLN VsEWMRiAcK6OBmEYVky2iQi8XVOyZzVs1g4k+EiDczrpXQ5EGcKuXmjdFicBrV1zDQdEvm SzbGMocFaOYKCpFNLj8mcdkHM1gOhLvtmNrbZMcXmGf4M1WfH5zPQRXdG0g+zux/2slvjN 1+diLR5+ANbCWtxrdQbcgGng4tZ61waM3o8EJ22Ydz1T1J8mVcdoxjbQkHYcU5uxvqUje5 SzqNSe3wKQ4HkbutOZi9BrKKRA91l1BjkV+v5qormi1b3qkSdox5YqBRPYHzyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668318049; a=rsa-sha256; cv=none; b=DyX5W/8KLB19an024a6Jc2V4XN3KSXl5CkPVgYtJJL2REwbUrTPRcewuJgFq5SY1I06/C8 NTUtVtXp/kmeWikexj+s/deRAiE9W2br7LvcpIna8LSVLHaWc8VGdethiVhjslYwrvOm0Q 3AeYoS4GGguXTIUc1hXPLqcwSdqV1APXN41um3bfvBXJ1jbMcvpTB4iEkye2pOIYtyRbFn XG09rtHTbs6Qki8dxa/NZN63GTLab8uMIR5kAF8OawE+8EZmsW2ykFiIQJNx2wlyTpQlOt jXlz16MaT3nvLVjWXxjKNvFRlw+1Pseb1fT4WwcsWKAt8gPFgWPouUSYlkIy4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N91WN74ZWzrfD for ; Sun, 13 Nov 2022 05:40:48 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 2AD5emXl074424 for ; Sun, 13 Nov 2022 05:40:48 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from bugzilla@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 2AD5emYX074403 for pkgbase@FreeBSD.org; Sun, 13 Nov 2022 05:40:48 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: bugzilla set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: pkgbase@FreeBSD.org Subject: [Bug 267526] pkgbase: Conflict between runtime and runtime-dev on /usr/include/dev/wg/if_wg.h Date: Sun, 13 Nov 2022 05:40:48 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: misc X-Bugzilla-Version: CURRENT X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: commit-hook@FreeBSD.org X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: kevans@freebsd.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated 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 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D267526 --- Comment #7 from commit-hook@FreeBSD.org --- A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=3D2b20cade1ecaf587520ddbdd8792977be= dd3569d commit 2b20cade1ecaf587520ddbdd8792977bedd3569d Author: Kyle Evans AuthorDate: 2022-11-10 04:20:34 +0000 Commit: Kyle Evans CommitDate: 2022-11-13 05:38:22 +0000 include: put includes into -dev packages The includes build is kind of funky, as we support either copying or symlinking files into /usr/include. For `copies`, we were supplying the include/ ${TAG_ARGS}, which puts packages into `FreeBSD-runtime`, without any consideration to the fact that we're installing headers. Let's copy the approach that the `symlinks` target uses for now, and add ",dev" to the TAG_ARGS so that headers at least end up in FreeBSD-runtime-dev, which is more appropriate. Some of these includes are actually technically supposed to be in *other* packages and their INCSGROUP's PACKAGE setting is actually correct, but this is less trivial to solve. This is a bandaid to fix the immediate problem of some headers ending up in two different packages. PR: 267526 Reviewed by: dfr, manu Differential Revision: https://reviews.freebsd.org/D37256 (cherry picked from commit 8b8babf044ca8e8f0d49894c3a41d429146ffc5a) include/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --=20 You are receiving this mail because: You are on the CC list for the bug.=