From nobody Thu Jul 27 04:11:57 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 4RBHQk0Qjhz4pQDr; Thu, 27 Jul 2023 04:11:58 +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 4RBHQj6GLxz3nFv; Thu, 27 Jul 2023 04:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431117; 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=RbEn9y8XdphLB19jfivXoqPzX6W3+41KJm1ia/aZzG0=; b=So90IGgiohqsDjpXA2wk1wi+qH5m9ow5Tj4dkz8trDSAlGkbC+lmRm1qKLHbM7n4B4/eRd kwluO0M+5uCy8ANVkMSkUuK+CcBTtFX8NaK43n87+anCodz949O5ajuJVT2cjDynDW96El 8JwTxoJx4aol4acrWqUXYNSPKg875+MfQAF3x+MOgaKMj1TpXMBFrfG5ZU5CDd5BiS0460 V1K11AMlZW6f43SEWJYGFZ3/tgkLwPuj3SxKnn9+sR0gQXbPesPt88Bp+pAgLVd1nyWcP7 06Y2z0U6uKtyKR5pRCnOFtvJnIHeqnp+OaKn4B2j8TwAuMPnWmmnd7tYp30TGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690431117; 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=RbEn9y8XdphLB19jfivXoqPzX6W3+41KJm1ia/aZzG0=; b=EHFx1D5RsrdlVe00V/kdHUFdiBt8vGXH+P0XtFKKQ5VjvfDG5X9rL1/MarVDXPx7ZHVAnc 3HM3xEKw4yjN68HwlN+CqCXIo64bQPUlTlCwjS8RKDXqEKuO8WfgHEcnqfObHZW2pIILPy ORpPZA258SuVQlmyo9qTeIpIyQq14aId322UtfGQf4CCvPMDGsLnVJ0PbtckmHliv/BXAD dfYDLWQt0uiON+YWmQNRjOg0WcIckai0ISKkw/XQjK39S9VcNMGE125PvC0cPHs4yeBq+G cmqFsr59/fZG6K+A2DNC1E0KrLsPmVyf4vfk6wF1zkjKdqU6/h8MicJ4SZayrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690431117; a=rsa-sha256; cv=none; b=RfSFaPJLvmW6rK1edGkzVLUunIPUInALIyaRtnpaWblQXHocOEIyQDbWt2j5NVV2Iuvk63 popOG1eVwUUBR03EsIFjrF2wWTNfJkCAliI5mOjbMcK1QvHDL1Hg2c6gUFOwND0YwiLEhN 324aZC0ynPgGmv2XxwKipAeNIWWgiCq+49ltKofhXG2PP6ZomQQxsXwoz7YMPoeo4DvBHT mdjj3SLSBHt0+K6VdL1QVvAtKmAFn0uIOuIu/g54cBuiN6Oe+sNOREcYybYaYsElJr1bM5 Ms+0ql/MQe9vqLGmpyrkyge7KbksFZvZdvuHSNT1MqelY0s9Z9OqSjwUvpRvgg== 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 4RBHQj596Cz191H; Thu, 27 Jul 2023 04:11:57 +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 36R4BvGN097577; Thu, 27 Jul 2023 04:11:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36R4BvcI097576; Thu, 27 Jul 2023 04:11:57 GMT (envelope-from git) Date: Thu, 27 Jul 2023 04:11:57 GMT Message-Id: <202307270411.36R4BvcI097576@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: 6853d893c7fe - main - release: Automatically generate MK_LIB${LIBCOMPAT} and lib${libcompat}-dbg 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: 6853d893c7fe65dfd7baaae9084467e312a62310 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=6853d893c7fe65dfd7baaae9084467e312a62310 commit 6853d893c7fe65dfd7baaae9084467e312a62310 Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:45 +0000 Commit: Jessica Clarke CommitDate: 2023-07-27 04:10:45 +0000 release: Automatically generate MK_LIB${LIBCOMPAT} and lib${libcompat}-dbg lists Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D41184 --- release/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/release/Makefile b/release/Makefile index 16fae5d74acb..c10d46247e97 100644 --- a/release/Makefile +++ b/release/Makefile @@ -37,6 +37,8 @@ WORLDDIR?= ${.CURDIR}/.. PORTSDIR?= /usr/ports +.include "${WORLDDIR}/share/mk/bsd.compat.pre.mk" + .if !defined(TARGET) || empty(TARGET) TARGET= ${MACHINE} .endif @@ -164,19 +166,20 @@ disc1: packagesystem mkdir -p ${.TARGET} cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \ - MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ + MK_INSTALLLIB=no MK_MAIL=no \ + ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no} \ MK_TOOLCHAIN=no MK_PROFILE=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ -DDB_FROM_SRC # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \ + for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \ + for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif @@ -204,7 +207,8 @@ bootonly: packagesystem cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ DESTDIR=${.OBJDIR}/${.TARGET} MK_AT=no \ MK_GAMES=no \ - MK_INSTALLLIB=no MK_LIB32=no MK_MAIL=no \ + MK_INSTALLLIB=no MK_MAIL=no \ + ${_ALL_LIBCOMPATS:@v@MK_LIB$v=no} \ MK_TOOLCHAIN=no MK_PROFILE=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \ @@ -242,12 +246,12 @@ dvd: packagesystem -DDB_FROM_SRC # Copy distfiles mkdir -p ${.TARGET}/usr/freebsd-dist - for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \ + for dist in MANIFEST $$(ls *.txz | grep -v -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ do cp $${dist} ${.TARGET}/usr/freebsd-dist; \ done .if defined(NO_ROOT) echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG - for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \ + for dist in MANIFEST $$(ls *.txz | grep -vE -- '(${base ${_ALL_libcompats}:L:ts|})-dbg'); \ do echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif