From nobody Wed Oct 1 12:36:22 2025 X-Original-To: dev-commits-src-branches@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 4ccDtt5PY4z69XxJ; Wed, 01 Oct 2025 12:36:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ccDtt2GSxz3mVH; Wed, 01 Oct 2025 12:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322182; 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=xKz80x7SBYV0ykXc6MoJat0CCNPkAvKotc6JxWCj3c8=; b=DI5nOjuGJN1jlUWLPeC5B08MK5UEVFUF11eVcZB44h69P1QOiGvwP2NjL1QZywVj/LD+Vs qACeeAbZBlnI4qSsB96Vlj8dxWdEk1cUBqbwykkDiSTUPIfvgzKVs503J88Ug/yigPoUEE 5dMZvl2wtqkFz8qV7zA8LDi/rvc2bAWeiCc1LTCBr0OkeS3qpqrporTehmS0QFwKvrwAEt dtkytPhRb+V8nK1HskEBiyMlGFRdqq9390HfGHzKo068QBTXnUXnEIzXouBV4DwxvkXRm4 HlSA3y7CyaKoXYN8TlXx5ZPEL0obWA+HH6L+0TWHGSw2qbMbgb5kNLDjelMGMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759322182; 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=xKz80x7SBYV0ykXc6MoJat0CCNPkAvKotc6JxWCj3c8=; b=IOaSsMgtW24pDJ/VnMX7i/IpqXcgUqZB/JMZGbpMdZIBiw8Q983NAxjylB2Xbtbh/d0C/k jVriluk2PoRJSi+2UrZIiNvqSZfSMumgjP43rLWbwLqxoFYjplapASdcpTGr0a7wXOYnol YAd+L6NX4kx5BBllaap5YpisWWANeVOoF34Wgt725sMW4NrA64ODGl4lQdIPrtdD8qqhT4 wANf4d/fMQn8V6xUMJfKYqe25rdrG/t5WeY41iKTGD3FyvpahTWONDejsG+1Ck3vfIOb2F UJFHmWHlbrCY5fgvBSX6r4iV6fbQZu3HFMtOprLSabLaqaE9PA7ZmOMSEABxVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759322182; a=rsa-sha256; cv=none; b=yPY1APrBXfiPi0rTrftlRW5Vvbwau4M/7AWBfORQa2/y3yjtL/CzXWaXIGWrHtYIFfcl+1 FcStdEnPFbhhM3B21BZyr67fRAyS0Rus42hpGx0MGgUt6/K3iOyPzrRnozmDJT3KQWhlGp ZEdlyiY3pCRE35gobWkHm+dpAhJKQxjcPEypsJqdtb+dVYDpT9ibum2FkLw1NO3+y1X99K +/XDUcV0utcYbYplQgBqM8CycYAxEpCPcr4254Ugqf1r7Qe0feQLJbreU9jUnnL6zXDYWG uArK4SKw25ILBoy24a5BjrV8P9HFn9jYs5bnuUepoFWtTmHq97p8jZgGg9liWw== 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 4ccDtt1qZHz7D4; Wed, 01 Oct 2025 12:36:22 +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 591CaMu0057935; Wed, 1 Oct 2025 12:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 591CaMJR057932; Wed, 1 Oct 2025 12:36:22 GMT (envelope-from git) Date: Wed, 1 Oct 2025 12:36:22 GMT Message-Id: <202510011236.591CaMJR057932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 50dc8aa3759b - stable/15 - packages: Move ctf-tools to ctf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 50dc8aa3759b2d70da998373d19c7a34eefd5f46 Auto-Submitted: auto-generated The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=50dc8aa3759b2d70da998373d19c7a34eefd5f46 commit 50dc8aa3759b2d70da998373d19c7a34eefd5f46 Author: Lexi Winter AuthorDate: 2025-09-30 08:29:37 +0000 Commit: Lexi Winter CommitDate: 2025-10-01 10:36:58 +0000 packages: Move ctf-tools to ctf Remove the ctf-tools package. Add a new package which contains the previous contents of ctf-tools along with libctf. This removes CDDL-licensed code from the utilities package. Set LIB_PACKAGE for libctf so that DTrace runtime doesn't need to install the tools. MFC after: 1 day Reviewed by: bapt Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D52776 (cherry picked from commit 24e4dcf4ba5e9dedcf89efd358ea3e1fe5867020) --- cddl/lib/libctf/Makefile | 2 ++ cddl/usr.bin/ctfconvert/Makefile | 2 +- cddl/usr.bin/ctfdump/Makefile | 2 +- cddl/usr.bin/ctfmerge/Makefile | 2 +- release/packages/ucl/{ctf-tools-all.ucl => ctf-all.ucl} | 5 +++-- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index 10854482cd21..1c605182bc1d 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -2,6 +2,8 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf +PACKAGE= ctf +LIB_PACKAGE= LIB= ctf SRCS= ctf_create.c \ ctf_decl.c \ diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile index cd9f850f480c..df53c46b7246 100644 --- a/cddl/usr.bin/ctfconvert/Makefile +++ b/cddl/usr.bin/ctfconvert/Makefile @@ -3,7 +3,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt -PACKAGE= ctf-tools +PACKAGE= ctf PROG= ctfconvert SRCS= alist.c \ ctf.c \ diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile index 23ded7458bed..357598583ae7 100644 --- a/cddl/usr.bin/ctfdump/Makefile +++ b/cddl/usr.bin/ctfdump/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump -PACKAGE= ctf-tools +PACKAGE= ctf PROG= ctfdump SRCS= dump.c \ symbol.c \ diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile index 4cd9511f911c..81bccc047a25 100644 --- a/cddl/usr.bin/ctfmerge/Makefile +++ b/cddl/usr.bin/ctfmerge/Makefile @@ -1,7 +1,7 @@ .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt -PACKAGE= ctf-tools +PACKAGE= ctf PROG= ctfmerge SRCS= alist.c \ barrier.c \ diff --git a/release/packages/ucl/ctf-tools-all.ucl b/release/packages/ucl/ctf-all.ucl similarity index 88% rename from release/packages/ucl/ctf-tools-all.ucl rename to release/packages/ucl/ctf-all.ucl index df2955dafab5..941990908373 100644 --- a/release/packages/ucl/ctf-tools-all.ucl +++ b/release/packages/ucl/ctf-all.ucl @@ -21,7 +21,7 @@ * text is licensed under the CDDL. */ -comment = "Compact C Type Format (CTF) utilities" +comment = "Compact C Type Format (CTF)" desc = <