From nobody Tue Apr 28 19:50:54 2026 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 4g4rdw3M3sz6c1V3 for ; Tue, 28 Apr 2026 19:51:00 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g4rdv5Fg5z3CkM for ; Tue, 28 Apr 2026 19:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777405859; 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=qGiWIaa/8c8XAHZ5dKTFs2hP5FDjYyRLFWJz0AhTps8=; b=q8O0zsnUtv3KoQ4gqm1B5f56IISVaTCSyWvl6XrvT6HnIA/nJ2WymLpq4OGHp6TD5nbDVi G518v5MvSRsL5pixKcYUsbQ1jo93oT+lkGx6N87hfnwPUL0b9dIEimNnLq6NhF8atZsoqX Q9t0E/W0t/MzUTKw7CzbQePwpIYjmQlcwsUHhTc7rcoBu1tfl3TnRBO7odwM3xTMtrjFQA NOeUVPC2kAdTljT1+GA+nqxvYFOCPfOhahWrTOZSbCfn9UGElLVb7xUJsc67zj4oCbPWrq eJnmoZpCv7zpuCzrjIo6Nlm+7CU2Txzl82WCG5ZSrkbUR1yPKgm5WJnYz6L5LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777405859; a=rsa-sha256; cv=none; b=BnHhBr4lnAKKpiRutEnuE63zWcVJ6aNO/NcGVq4kcGLXNu4x8Bm6qc4KBtBYneCAD75MZo EqKv0yG/PTFveh9ursP3oykdax+riERHWmGWx5V8JNr1NUxFHsxjeO2EkHA9uOyvb/z2dS x6s8dVls3J+JzS3gkDi63QxByOvVQKgeRxC7B/LLJrAfuG+eoH4UVexqV9s+H2wQpTAOs1 BkVKMv7oKz+LBDwkvtDm7JFIuPc+pQu4b5qaxyLqGkh0i/6Z/kD0ZnaMFQ4C+2wCW14MRb oqTU4ltymV8EG8v8tQTE2JIBWbml4mIGqGvjIPb+YokDBKfLdDG8oWLCj+FSuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777405859; 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=qGiWIaa/8c8XAHZ5dKTFs2hP5FDjYyRLFWJz0AhTps8=; b=qk0/PJ+SSrvNb6aQs0Cwd4O5Rf8NrxeuOKAUejppEWVI5nrJF2Ey0Cx6Os4UjcqBlpijf4 aT7SDC9g2vhUyRk/3oWE6KOzESHZ5h7/FfjUHhVQgO4GsiOhRQBIpEaJa/cClsx5q+RypE IdxgRqtei4ljhYUIOdsTklzU7uoFOk2i21pFgR2f8FVUYaeQUSJAhgferzrNiZs69CllXY s71XEGIFsRm0il3d2OxMzWSJzAQ0xctnPqx/HqGX2djxxUk/XplsA+LrOLDr0L+MEowtDY G6wULgoVP2w/GoAKo0x6TtWLBNX+LuTs2Z2iXUuWSEZ9UcdKVVwwcgt0ugLgNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g4rdv4p1Gz16wS for ; Tue, 28 Apr 2026 19:50:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35bb6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 28 Apr 2026 19:50:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: c4b244af42a1 - main - acpi: Remove userland bits on non-ACPI platforms 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c4b244af42a1f20937939a824b753a92c9c0a46f Auto-Submitted: auto-generated Date: Tue, 28 Apr 2026 19:50:54 +0000 Message-Id: <69f10f9e.35bb6.4350287a@gitrepo.freebsd.org> The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=c4b244af42a1f20937939a824b753a92c9c0a46f commit c4b244af42a1f20937939a824b753a92c9c0a46f Author: Lexi Winter AuthorDate: 2026-04-28 19:37:33 +0000 Commit: Lexi Winter CommitDate: 2026-04-28 19:50:41 +0000 acpi: Remove userland bits on non-ACPI platforms ACPI is only supported on amd64, arm64 and i386. Don't install the power_profile rc script or devd configuration on other platforms. This avoids creating a useless FreeBSD-acpi package on those platforms. MFC after: 2 weeks Reviewed by: imp Sponsored by: https://www.patreon.com/bsdivy Differential Revision: https://reviews.freebsd.org/D56650 --- libexec/rc/rc.d/Makefile | 3 +++ packages/Makefile.arm | 17 ----------------- packages/Makefile.powerpc | 17 ----------------- packages/Makefile.riscv64 | 1 - packages/acpi/Makefile | 6 ------ sbin/devd/Makefile | 3 +++ tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 7 files changed, 10 insertions(+), 41 deletions(-) diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 3eed19987f83..cb94380aff32 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -88,9 +88,12 @@ ACCT+= utx .endif .endif +.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \ + ${MACHINE} == "arm64" CONFGROUPS.${MK_ACPI}+= ACPI ACPIPACKAGE= acpi ACPI= power_profile +.endif .if ${MACHINE} == "i386" CONFGROUPS.${MK_APM}+= APM diff --git a/packages/Makefile.arm b/packages/Makefile.arm deleted file mode 100644 index e7e37f03a7ba..000000000000 --- a/packages/Makefile.arm +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: ISC -# -# Copyright (c) 2026 Lexi Winter -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -SUBDIR.${MK_ACPI}+= acpi diff --git a/packages/Makefile.powerpc b/packages/Makefile.powerpc deleted file mode 100644 index e7e37f03a7ba..000000000000 --- a/packages/Makefile.powerpc +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-License-Identifier: ISC -# -# Copyright (c) 2026 Lexi Winter -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -SUBDIR.${MK_ACPI}+= acpi diff --git a/packages/Makefile.riscv64 b/packages/Makefile.riscv64 index 2df3c30b3544..bc53723bb04b 100644 --- a/packages/Makefile.riscv64 +++ b/packages/Makefile.riscv64 @@ -14,6 +14,5 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -SUBDIR.${MK_ACPI}+= acpi SUBDIR.${MK_BHYVE}+= bhyve SUBDIR.${MK_BHYVE}+= libvmmapi diff --git a/packages/acpi/Makefile b/packages/acpi/Makefile index 360ecf22e9e7..edd4cdfe7090 100644 --- a/packages/acpi/Makefile +++ b/packages/acpi/Makefile @@ -1,11 +1,5 @@ WORLDPACKAGE= acpi -# On these platforms, acpi only contains config files. -.if ${MACHINE_ARCH} == "armv7" || ${MACHINE} == "powerpc" || \ - ${MACHINE_ARCH} == "riscv64" -SUBPACKAGES= -.endif - # ACPI isn't applicable in a jail. PKG_SETS= optional diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 3dab9f7c9a25..78b2b039ac6e 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -22,10 +22,13 @@ DHCLIENTDIR= ${DEVDDIR} DHCLIENT+= dhclient.conf DHCLIENTPACKAGE= dhclient +.if ${MACHINE} == "i386" || ${MACHINE} == "amd64" || \ + ${MACHINE} == "arm64" CONFGROUPS+= POWERPROFILE POWERPROFILEDIR= ${DEVDDIR} POWERPROFILE+= power_profile.conf POWERPROFILEPACKAGE= acpi +.endif CONFGROUPS+= CONSOLE CONSOLEDIR= ${DEVDDIR} diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 5c1b47d97a8d..cfd040ee60fc 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -53,6 +53,10 @@ OLD_FILES+=usr/share/man/man8/acpiconf.8.gz OLD_FILES+=usr/share/man/man8/acpidb.8.gz OLD_FILES+=usr/share/man/man8/acpidump.8.gz OLD_FILES+=usr/share/man/man8/iasl.8.gz +.elif ${MACHINE} != "i386" && ${MACHINE} != "amd64" && \ + ${MACHINE} != "arm64" +OLD_FILES+=etc/rc.d/power_profile +OLD_FILES+=etc/devd/power_profile.conf .endif .if ${MK_APM} == no