From nobody Thu Dec 12 16:30:29 2024 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 4Y8HyF6cXGz5gT04; Thu, 12 Dec 2024 16:30:29 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HyF60Yhz4lmy; Thu, 12 Dec 2024 16:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734021029; 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=9mkuk1Sb87rIc7e5vD+03kpyBj/piWqnpD1q/Mf7TiY=; b=JaBF8fVBfIscljPxdOCbQyVoYqHNS91MYIEsJYwstJmIWcGbOgbXAvw328zeyotRgASDfS QCf5R0w43f3G0W+QwKgMo2ej2fR9XzkSppZs6tK6c6gR8ozVRKgg08c47m+9iZ70jVekc+ 6k/q4LN4RfmbRRK9iw7K0ju3H5IEzqSb6vPvje/Klkcr+uIg6/v3A2EQnQO9ptJuA7rS/x 3Mg3NOflttPYhEpOFyOrEVIQz3aiIa563Nh6vR3PoAfJ7QNqB3VAYR2t5SSHdDb8SP0jIR 0DpHSN64UfKLW4XI/T8W69Vxtn3NtSVkvGtuu480RIvGQFWSn0mlQkAbK0ghYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734021029; 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=9mkuk1Sb87rIc7e5vD+03kpyBj/piWqnpD1q/Mf7TiY=; b=OfO/QHd8atrBJHNksQRKc0DE962tFW/l+rIFRK6VihdA5nyTQiDSKLZ6JP3q+Fk9pHVho1 cQHhMqm40VP1S9QjRoMv4n7Dm5mp4Rd5bu/aXMTDRbKef3numhWsdZLXgk1e3bNqWgDE+t xsecrdWwmXTwV/8MXz3kcOJcYKnmwO2pmNT7gW9kutEHuIsRSZ6K5cwQozJYcnKFPeLBy6 iP2cS+y2HoAcIKNgcMNd8BkLpBDS5a5CDQUFEw/Jp7mnXJHUWiHNGSohSoCRat+Up08kiw upc5qHzK+ab4vj9CGB1k8jGHCdRYIGN/gjkvPoiEzt+ML9KakZ+4i0AlcccKTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734021029; a=rsa-sha256; cv=none; b=ovQIsE5mQSBVBYkh1b7vcubEU5i29jjfxW5BLP6xFGq3k6sz/Hzl5YPWshumRrGwXnqqwt otuQjE3NP0rfH9S+WYbSvKbxQY+hPnWF1cvS/z5f3hdYQnHxqtyz6cosowyLVnS7FpFioF Q3npdjhaQrTFbLBC4AcnSqGfxpB43rfr8yT9bCHOSRpelPvzXuhK8LbrQiywMbVhO0ZhE5 7+898ta/3LR5Vt7p1kZADYkEhhY582MmLoLgilmCYpxMRigTIF6GYPa09hIedrZKmWwJTI CEIT+7iteISUJNFCla9Ec/VtUZTGtMZ7SERzYfEwMPIBHFw7X7jhwFLjzdd7MA== 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 4Y8HyF5br7z10qM; Thu, 12 Dec 2024 16:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BCGUT7m000268; Thu, 12 Dec 2024 16:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCGUTiS000265; Thu, 12 Dec 2024 16:30:29 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:30:29 GMT Message-Id: <202412121630.4BCGUTiS000265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 7d0d52fc7c53 - main - distributeworld: dedup dist(.debug).meta generation 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d0d52fc7c53bcb3c827fa6873baf583633ad183 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=7d0d52fc7c53bcb3c827fa6873baf583633ad183 commit 7d0d52fc7c53bcb3c827fa6873baf583633ad183 Author: Brooks Davis AuthorDate: 2024-12-12 16:14:14 +0000 Commit: Brooks Davis CommitDate: 2024-12-12 16:14:14 +0000 distributeworld: dedup dist(.debug).meta generation Debug file distribution metadata generation was added in 2d0bcb76c8530 as a near duplicate of the default distribution bits. Add another loop instead of copying the code. While here, improve indentation. Reviewed by: emaste Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D48038 --- Makefile.inc1 | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index ef63bfd52381..5cf431733f8e 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1538,24 +1538,16 @@ distributeworld installworld stageworld: _installcheck_world .PHONY .endfor .if defined(NO_ROOT) .for dist in base ${EXTRA_DISTRIBUTIONS} +.for path suffix in "" .meta /usr/lib/debug .debug.meta @# For each file that exists in this dist, print the corresponding @# line from the METALOG. This relies on the fact that @# a line containing only the filename will sort immediately before @# the relevant mtree line. cd ${DESTDIR}/${DISTDIR}; \ - find ./${dist} | ${METALOG_SORT_CMD} -u ${METALOG} - | \ - awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \ - ${DESTDIR}/${DISTDIR}/${dist}.meta + find ./${dist}${path} | ${METALOG_SORT_CMD} -u ${METALOG} - | \ + awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \ + ${DESTDIR}/${DISTDIR}/${dist}${suffix} .endfor -.for dist in ${DEBUG_DISTRIBUTIONS} - @# For each file that exists in this dist, print the corresponding - @# line from the METALOG. This relies on the fact that - @# a line containing only the filename will sort immediately before - @# the relevant mtree line. - cd ${DESTDIR}/${DISTDIR}; \ - find ./${dist}/usr/lib/debug | ${METALOG_SORT_CMD} -u ${METALOG} - | \ - awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}/, "."); print } }' > \ - ${DESTDIR}/${DISTDIR}/${dist}.debug.meta .endfor .endif .endif # make(distributeworld)