From nobody Thu Nov 10 04:21:05 2022 X-Original-To: dev-commits-src-main@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 4N77tn5Qgfz4dW7x; Thu, 10 Nov 2022 04:21:05 +0000 (UTC) (envelope-from git@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 4N77tn4nH1z45Cf; Thu, 10 Nov 2022 04:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668054065; 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; bh=UsIiBOQqozg8NoRTAwCVhuYyrypXdcV3npi4OFh7jSU=; b=V1QQi3ZyaGccKnFXlOxazPyBmJIWk5dkkScBOH8VeVKdzpPtOrFkn6vwG5gGw/tKII1/fp 5gl6ZkG+Q2oIDrXCT1ZsPWh5SV0rH6Tb624zknY8D69gXEHayrpbcdyL+Fwpt1cYsKjoZt p0S120YhlpUvUUHUo2jZYFOSomyeQPoNrUXBz7t5ueyLWrVD7xkTwkj7ZRbmrlqHGEXKyN EBW/Qn4xoiiqMDGNQ6/PzwLsSHCZSANm4+sP+rgHexV1gf1819dcptUF+nfoXKzfH50brK DCbnlf9M4JjlNWpzu3S5nYUWaNiT8nRBBY5NKvzxQMUuWKGpXKL4yXtDmyxUUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668054065; 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; bh=UsIiBOQqozg8NoRTAwCVhuYyrypXdcV3npi4OFh7jSU=; b=eEisVCZeuS05WiwUeQMF/li9VL035gguClfmvLp1m1lzGzCRYad/F4tGGvT1u+Cu7vPCMa eXzpxt2W19hhBICK0vGOFT70f3Ts2Q/QWTjM+Y84xfJN4CRHLblWCl6WTArk2n/I2Lsi8G jOadQmkR1VyKk2FqafXkv9cy86l1FyAsDMLN8p3It7iVrg4+HlYlVlIGU0VhR6mv6E5K1J 613ZdkUqSa/a1V0bsK6YHk4EY083dwAnS27N2IIh9NoG2OvNKYXeswArT5LtKmlq2/Vdow +od6FyfmuHIu4ALpE49PGfITxnP4hQByeI+97BNhWx9zn0IcaQkBj+P4xO2l0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668054065; a=rsa-sha256; cv=none; b=pyn/DftGSwP3aZVFQiWWdZ5zXpgCXmgGzw1DTrvbxoI63ZIAajunGS+4tb6ZeHIrDdSYbc NfcMem1njkEdrHAHOP9sFteSp/F2pQP9NgMkGbALIQiQylj/AjkpGWjPC1wHuths7irjgX ZHLSeMl61Id0LkbG55RGRlpGkSETJGKrcV90ymfuGXTSe8KQKPvsCt9GQjRttjLWxZAs64 s3o1on3BLyRDsHm/Lm4GpYdD+Xc4i9zVll9L9wORsuEa4/Lwx+IVhl+iR2ChZtkqtKOG+H o3Mtu8oLiVG9h4J2YAdzxUqOfL+CsOpOn7eYRJBOauj/d69fBr9OJuOWlbylnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 4N77tn3qpdznRb; Thu, 10 Nov 2022 04:21:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AA4L5HS030811; Thu, 10 Nov 2022 04:21:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AA4L59k030810; Thu, 10 Nov 2022 04:21:05 GMT (envelope-from git) Date: Thu, 10 Nov 2022 04:21:05 GMT Message-Id: <202211100421.2AA4L59k030810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 8b8babf044ca - main - include: put includes into -dev packages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b8babf044ca8e8f0d49894c3a41d429146ffc5a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8b8babf044ca8e8f0d49894c3a41d429146ffc5a commit 8b8babf044ca8e8f0d49894c3a41d429146ffc5a Author: Kyle Evans AuthorDate: 2022-11-10 04:20:34 +0000 Commit: Kyle Evans CommitDate: 2022-11-10 04:20:38 +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 --- include/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/Makefile b/include/Makefile index 988b0a56baa7..643451367b1b 100644 --- a/include/Makefile +++ b/include/Makefile @@ -358,29 +358,29 @@ copies: .PHONY .META -name "*.h" -print -delete || true .for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec} ${LSUBSUBDIRS} cd ${SRCTOP}/sys; \ - ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${SDESTDIR}${INCLUDEDIR}/$i .endfor cd ${SRCTOP}/sys/${MACHINE}/include; \ - ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${SDESTDIR}${INCLUDEDIR}/machine .if exists(${SRCTOP}/sys/${MACHINE}/include/pc) cd ${SRCTOP}/sys/${MACHINE}/include/pc; \ - ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${SDESTDIR}${INCLUDEDIR}/machine/pc .endif .for _MARCH in ${_MARCHS} .if exists(${SRCTOP}/sys/${_MARCH}/include) - ${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -d ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${SDESTDIR}${INCLUDEDIR}/${_MARCH}; \ cd ${SRCTOP}/sys/${_MARCH}/include; \ - ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${SDESTDIR}${INCLUDEDIR}/${_MARCH} .if exists(${SRCTOP}/sys/${_MARCH}/include/pc) - ${INSTALL} -d ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 755 \ + ${INSTALL} -d ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 755 \ ${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc; \ cd ${SRCTOP}/sys/${_MARCH}/include/pc; \ - ${INSTALL} -C ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ + ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${SDESTDIR}${INCLUDEDIR}/${_MARCH}/pc .endif .endif