From nobody Sun Nov 13 05:40:12 2022 X-Original-To: dev-commits-src-all@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 4N91Vj04d5z4d7f8; Sun, 13 Nov 2022 05:40:13 +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 4N91Vh6h0Xz3L70; Sun, 13 Nov 2022 05:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668318012; 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=a9+fVWSfXii/0jcTbUsVml09SH+ZRGSllGO5SOPJwAs=; b=vn6ctLfgo4n5CK7SZPxiorpU6o0FMD/Xr7eeIG5s+fO2xqfU9fBp4IJzuB31O7+Qz7iqBJ mNUyTxjLxjQStQ67Rke6XmuLL8qI9gCMSTyNsKilkjJQKWHefsj7HYTC57v/AsoJA2uvvc CITRogDxOKDEpP4/T9pdbbbpB2PzrlF1+qQelaBNlo6+7bNsN8fmmAgPv4BnNi7QhiOUZk zDb5lkxdQUXqsDfNBFZSK8deUBKKBvcctzHcD2zmGSdX8SsH/TfH6ZTPJ4YdcOdDFkgsWZ 4mqWaAOwv0K9cC5UWtmluHH3r2T3ukGDqZzLgpIkLeVo47ZaOzkeOwNSRUctoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668318012; 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=a9+fVWSfXii/0jcTbUsVml09SH+ZRGSllGO5SOPJwAs=; b=Dy+/chWK0yXAmj12nU5qv51b+729FlGM9yagVOTy50YHx9baBx5k5VrztJAor+3EMoEfBT EvaZIPEMe+rXcuWUOAoTu2jOHqglvk0bTK2BAx6LhvvxSZ+a+rmqjoCg7Tg1EIExfq5LoN 0rYrob9lnXJIEJ2XeBEQBjg9ppx4rPD5+lKz2NVQecEwUO3ttKSrcbT0f+JtK3ms75JWlL y9Q2PjJrSEFYtp5Kc/7CjcLT3GCntclhomqt4x4iVkDuE2FiUlKjgaYOYJlOHaOc97u2tr RzOVPQ8ayf+qMDL3KPDdw/8QI1O6DXwriI11JgdIjJ7Cv+N9XvXdXdRRVrJ/vw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668318012; a=rsa-sha256; cv=none; b=kCiJqBjVJBqSppzIGytsg29TRrmOYVEhmwrfjKt4SIKr+7XnaUyh6SngABc1bJR0tJNNTW oHhzBCpM+U/VFvMPZ0EEJslMshGBPUAzZHeubLTnY0ILuoIxanSZ7dBHBxKqychpK0FWbA 3R9HeYieVY4NRsv685zlMs39u1j4D/R43zfpOSTnWiBP3TN9533NhUD3XfPJ8I2xzgfNOW QggJ1CPE5Jd8fQq94R7t16cZsP4O2aITnEJmQOKNjsTj0XbJ9V3WPQxr+SSDABwlEI+PPP x/1FcdWPephmXSd0APgmRAhSb8zxjYjQCPcfJFzbjuiwL2kpGJx8zMlo9THFvQ== 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 4N91Vh5lYDzrC1; Sun, 13 Nov 2022 05:40:12 +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 2AD5eCAZ002688; Sun, 13 Nov 2022 05:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AD5eCpG002682; Sun, 13 Nov 2022 05:40:12 GMT (envelope-from git) Date: Sun, 13 Nov 2022 05:40:12 GMT Message-Id: <202211130540.2AD5eCpG002682@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 2b20cade1eca - stable/13 - include: put includes into -dev packages List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2b20cade1ecaf587520ddbdd8792977bedd3569d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=2b20cade1ecaf587520ddbdd8792977bedd3569d 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(-) diff --git a/include/Makefile b/include/Makefile index afa79f73f1bd..6f30598fedab 100644 --- a/include/Makefile +++ b/include/Makefile @@ -350,29 +350,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