From nobody Thu Jul 27 04:11:55 2023 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 4RBHQh3mYxz4pQG2; Thu, 27 Jul 2023 04:11:56 +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 4RBHQh0sljz3nKl; Thu, 27 Jul 2023 04:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431116; 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=tqvn+yJKsWUffmjLajRN26nHbVezqzfC3Bxx3//TKPw=; b=DzOFEgAMYvh83PctmP/GwnaCr1zEWjPAteUE9HXfw2w6QGWIUMVdbiyp9YZhAB0sS96Zt4 GCVzF6uGXcMg+P0SH8HZWFb/+o54wajjLsscg1iAjfg72QSbpIp/kHVt4Fxuzg+xcrujEz RzrDPWklMGQr+dGjn8kjcY5/fE3olKkf1oHU28RzboVLLh+5VeXLz1su8VlhgGRy+Dh+Kp ClSvyi1PGkeQz2KfEVT6FnbkWh/r7aa0BZFf+/+ZLxdarIkPpbxAkXntR5+tN4QJT6LWr3 2LSmitQgEa2cbgwzMoD27WVbaEl5KCuM8RS11WXU2cUNCwHQr1SiUibN53Wxxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431116; 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=tqvn+yJKsWUffmjLajRN26nHbVezqzfC3Bxx3//TKPw=; b=KXg/AO2XqTZgsNjn7PB0Ujvg4JfX/u9mHG46rua65gOoErv/fYXZluOz2y+1MR1YLbo7mw hIhQSvjjGmU4Lj+S6ibsbk5IM4zQz4UkqbO+WlH5stsf9bFZnUyMR8aC6ZwLqGORrP65kB TIc+MXUOY+3ak2pKuBB9hujI7qRigIiHfhMqqAwJ1N83appmgwHv4B5ZS3dluHoM4fqZnn 4VyLmhH4ph4byjNLGJMGkH0yAM5FqJDKHeaVqm0UxNebjYl2nE1yH2TFBAjSeCPB34GAHZ ZBM/VnMb05dVJeuXjAhnVsrxrSkK6FEtJpaEXcnNXbcAjwhskZqgFUZQoWw02w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431116; a=rsa-sha256; cv=none; b=kp+qJhn5vrG2hR9KcI9cOeAwTHyLDXDJb7D9MSFZg6b48LuQ0cDAHNcX59ujlGgqSuuSbn WFdALBUTTKeahjvrb+u0Legjsik6lwe84ixZ1q+wepWFFfF4lg4SGMVB4gZjqCDCl0pfFz br5gnhVAILwmBDR63u8yA3PzjzpYd9xl5L7o5fDg/w9SFS6ZAy/9psR/Zq1ytdPPZi4i94 PPru+uJv+/aCKbZ+mFVA8bYuxcQqOIkDmI5tEnO125nnWQWmSwZCliSFAWFfpTwwSD5cTk HzkLrN8T+yo482t0kHvnuFEDZlw2kJwCW1+C7r6GAmPnbePeYIivFzVNoFZ/JQ== 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 4RBHQg408Pz192d; Thu, 27 Jul 2023 04:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36R4BtnS097536; Thu, 27 Jul 2023 04:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4BtsH097535; Thu, 27 Jul 2023 04:11:55 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:11:55 GMT Message-Id: <202307270411.36R4BtsH097535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 949199a212ec - main - etc: Automatically generate BSD.lib${libcompat}.dist lists 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 949199a212ec714eab77ee2dc9b95252eb32ca2c Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=949199a212ec714eab77ee2dc9b95252eb32ca2c commit 949199a212ec714eab77ee2dc9b95252eb32ca2c Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:44 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:44 +0000 etc: Automatically generate BSD.lib${libcompat}.dist lists Note that each libcompat still has its own file that must exist. Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D41182 --- etc/Makefile | 10 +++++++--- etc/mtree/Makefile | 10 +++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/etc/Makefile b/etc/Makefile index 528e348d6139..53d76ba8fdd7 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -4,6 +4,8 @@ .include .include +.include + FILESGROUPS= FILES NLS_ALIASES= POSIX C \ en_US.US_ASCII C @@ -104,10 +106,12 @@ MTREES= mtree/BSD.root.dist / \ mtree/BSD.usr.dist /usr \ mtree/BSD.include.dist /usr/include \ mtree/BSD.debug.dist /usr/lib -.if ${MK_LIB32} != "no" -MTREES+= mtree/BSD.lib32.dist /usr -MTREES+= mtree/BSD.lib32.dist /usr/lib/debug/usr +.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} +.if ${MK_LIB${LIBCOMPAT}} != "no" +MTREES+= mtree/BSD.lib${libcompat}.dist /usr +MTREES+= mtree/BSD.lib${libcompat}.dist /usr/lib/debug/usr .endif +.endfor .if ${MK_TESTS} != "no" MTREES+= mtree/BSD.tests.dist ${TESTSBASE} MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index 5dfefc9d5c21..b55e9d215b6c 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -2,6 +2,8 @@ .include +.include + PACKAGE= mtree # NOTE: BSD.debug.dist is unconditionally installed for developer ease-of-use. @@ -9,15 +11,17 @@ FILES= \ BSD.debug.dist \ BSD.include.dist \ BSD.root.dist \ - ${_BSD.lib32.dist} \ + ${_BSD.libcompats.dist} \ ${_BSD.sendmail.dist} \ ${_BSD.tests.dist} \ BSD.usr.dist \ BSD.var.dist -.if ${MK_LIB32} != "no" -_BSD.lib32.dist= BSD.lib32.dist +.for LIBCOMPAT libcompat in ${_ALL_LIBCOMPATS_libcompats} +.if ${MK_LIB${LIBCOMPAT}} != "no" +_BSD.libcompats.dist+= BSD.lib${libcompat}.dist .endif +.endfor .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif