From nobody Wed May 10 01:10:31 2023 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 4QGH5N26Mdz49p0h; Wed, 10 May 2023 01:10:32 +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 4QGH5N0sv2z3rCR; Wed, 10 May 2023 01:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681032; 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=0Ab6wqkiVMB42VlN04Ql+02H2zE3t8Aax+zqvwIYAbM=; b=gB/Iqs4lm9efmKxiREDZt/LPjHBtgWpZGIQNn0oeL414jQSW+9by0q27yM/kpt4quxTzLO mBxU8DPJSQYTxiuPot8EtNBR8hP6f7xEiRyCU6jLqhR2dEHfyuVD/CUy+ek9+unGpV+QqT KmNTcSqK9xtvzZM/2e9CVmdBY+xTZqxFHqbPMCx21GowMLEsTB3UsC6q/FtoKStl2oSjjU 60QmXjDKPcHvo7X3yK7YQUhI2Tf/dMkJIJtknqIk1IFOX4X2AstT5kfjV3FNeaNndqCD82 kEXiuaJjkJLK6kCsRI8zgxSwkBchi0VY8/kXESPiM9ljUoKUKbc4z2+Frjuidg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683681032; 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=0Ab6wqkiVMB42VlN04Ql+02H2zE3t8Aax+zqvwIYAbM=; b=S0JC0wDHGE42I6SyrrBleNeGsxxiSj8pHOVNf3wU00YOAyIq+GXU4p1zCXmFaUAQGSIb4q Yv4Flqhyj+L1Ti8UiZNWXW9dJxgq7ouq45+YojRy0n4dcwMqWQ8PTHPTDA7u0aGZi8J2sa vErJ/JhvFDH/Micbm7v7hHY7eJwhSHDDK19CrEexAAjz2+P+c+9VRIfbEVXBkNDDFYOoEs GW3SGwET81aEoLM149NrRh60+yiQWLQ+gZV9wA+6e5qxIyE2XTeTbu/vzSm+VMzaeQMZVe 6Wkp9SX8LKc1QogC5kkRpVvRgjeW8Qgl2u8luUnoHtVbZa/mzXHX1pwsBmZHTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683681032; a=rsa-sha256; cv=none; b=YKheF5UZZy/LFrsfC6NAfVjk6HoqPoMTAOOJ6oEkDAr37bzpDmjtlRPsPW/2GCQ1l3GsX6 z4bdPPDT7oBOM4sdjlaeaPRfSrmBdhczDira6z02MSTnsP6rezN+aAGgfEm5ura64lwMzv VIdUIGiNH0PoMe0Oj5pqrMU1Zhoos3jwBTyyVmRWYc9Yhyf1mwuwX/cTqdYUX1zss/biIe ehe/keujLtXzn0MiXBWhIMunK1vFOznQ2CCm1t2X9c0ZtcUgl6eNvNOVly02W7AYZS8TG+ eusZBJHX7X/JsqTCHCXNWfDge1Ob64iLnYYN/p/+2+sRHmpOn1p//qE1mJ5rTQ== 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 4QGH5M74kDzqxR; Wed, 10 May 2023 01:10:31 +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 34A1AV9l078845; Wed, 10 May 2023 01:10:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A1AVEP078844; Wed, 10 May 2023 01:10:31 GMT (envelope-from git) Date: Wed, 10 May 2023 01:10:31 GMT Message-Id: <202305100110.34A1AVEP078844@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b6271cc0d0cd - main - includes: avoid installing if_wg.h twice 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6271cc0d0cd6e4f9592ac88b3892c3931e5f25d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b6271cc0d0cd6e4f9592ac88b3892c3931e5f25d commit b6271cc0d0cd6e4f9592ac88b3892c3931e5f25d Author: Ed Maste AuthorDate: 2023-05-10 00:28:44 +0000 Commit: Ed Maste CommitDate: 2023-05-10 01:09:39 +0000 includes: avoid installing if_wg.h twice if_wg.h was installed via dev/wg in LSUBDIRS and also explicitly. We want to install only wg/if_wg.h not the other headers, so add dev/wg to the skip list in the copies and symlinks targets. PR: 271266 Reviewed by: kevans Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40031 --- include/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/Makefile b/include/Makefile index 20d735394d9d..eba2675e1d1f 100644 --- a/include/Makefile +++ b/include/Makefile @@ -357,7 +357,7 @@ copies: .PHONY .META cd ${SDESTDIR}${INCLUDEDIR}; find ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto \ machine machine/pc ${_MARCHS} -maxdepth 1 -mindepth 1 -type l \ -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} +.for i in ${LDIRS} ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec:Ndev/wg} ${LSUBSUBDIRS} cd ${SRCTOP}/sys; \ ${INSTALL} -C ${TAG_ARGS:D${TAG_ARGS},dev} -o ${BINOWN} -g ${BINGRP} -m 444 $i/*.h \ ${SDESTDIR}${INCLUDEDIR}/$i @@ -393,7 +393,7 @@ symlinks: .PHONY .META cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ $$(printf '../../../%s ' sys/$i/*.h) ${SDESTDIR}${INCLUDEDIR}/$i .endfor -.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec} +.for i in ${LSUBDIRS:Ndev/agp:Ndev/acpica:Ndev/evdev:Ndev/hid:Ndev/hyperv:Ndev/pci:Ndev/veriexec:Ndev/wg} cd ${SRCTOP}; ${INSTALL_SYMLINK} ${TAG_ARGS:D${TAG_ARGS},dev} \ $$(printf '../../../../%s ' sys/$i/*.h) ${SDESTDIR}${INCLUDEDIR}/$i .endfor