From nobody Sat Jul 25 13:07:59 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 4h6lXJ2sk2z6lNDJ for ; Sat, 25 Jul 2026 13:08: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h6lXJ0hRkz3lkT for ; Sat, 25 Jul 2026 13:08:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784984880; 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=alDuJZeFJYYwQtvxAyr1z0N1LDr/KXYEt83AhdzreA8=; b=oH2UTXNnKxChjuM92dAg89LlnxKy8tjOpfH4ckF+niQ9fw+xAzIbwzHlX+tW2t8yTNKZMg 5+xkJLAzSJ6Yz6Mxkx44EDJhw0ZjtA5/WMdd6aAoptM4+yNZSyTjGTRjmoDD+LRfwo3NPl UdTQSTpO7krsHk9NueOi8Kei4I1CJ5NtT+A+XKRQ8lrquGGv3sWAtl9U/KYqhtb4pX6Puy 8A1r8MyStz5nZ6YdxXqx3sgo1WgS/sBZ5nBmNsE3RfDeQM9Pz8kFbvkn8FaoJqsRSmFGwP dpT1hi72NmY2Vmonp5R3/uz9L5vSCvKctcnKMw4Tri4Zvw6f+oNzN/pElUv/Uw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784984880; a=rsa-sha256; cv=none; b=Nedhbpz2MUvIYKINtfcZrPYO41lVcpv3HvUt3w2cwFO5NZRaD8ltzH1G6AWgbwSCeTcwDI L4ElzOKUR8HxB1sAbCr9ZteeXvCL5eA3s1h+dR5FFyYXjO3h6asQcZTLcCUyICwWCWBLpI B2p2oOadiT2wuqfw1IdlxYOkfzy3oUR51w0Klx6o/BbuJlabzq90gRsUVuCZGRUBMmUwi/ Cs+zK7cU4ZtlLkLoJ+OjBoWb77NJtNc8B6B/mxLvsi/lY7YvzlidUn7enGEoauWh8aCSkn XY7SlLcgA6PoGRaMn3wZp0O3L4zuIljbiq0KDXZ638bsLRkFfaL5R/nKCYTB+Q== 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=1784984880; 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=alDuJZeFJYYwQtvxAyr1z0N1LDr/KXYEt83AhdzreA8=; b=QZL4McgXc19E4BBvwmUiuVb2wIV6OK9OaZykGrdSjYmXy9u9yw0zS4xfytHB2MGhqP1Wmo uTe8PNJ4bBnRy/eP4cdtDLyRywm4KXxiFXtE3Hp89V06HykmYBtUKmgeCqNeRvIpVm5moZ R2SM45HcTrncILCNohJ82Iix5BGRixkmW09EdzE7sOQlKTkiCq+2ofTrqwJRQNU8j69bU3 eJbaMeErwMbkyn9RLS95v/+TTWKpfk10YVpCeGbVXeDIjWnPw4+SDyMQKihL67EzOPc7Ub MV4lplvtCyJCyaRsT1cy6q1fGNBNza2BGZ/jl6q/WnxAXdz0957b4wqg/yM+jQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h6lXH6ZMHzdRY for ; Sat, 25 Jul 2026 13:07:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25471 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Jul 2026 13:07:59 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 58c08517ce5d - stable/15 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 58c08517ce5dea7515837c8c4f24d3beefe48403 Auto-Submitted: auto-generated Date: Sat, 25 Jul 2026 13:07:59 +0000 Message-Id: <6a64b52f.25471.74ef81f3@gitrepo.freebsd.org> The branch stable/15 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=58c08517ce5dea7515837c8c4f24d3beefe48403 commit 58c08517ce5dea7515837c8c4f24d3beefe48403 Author: Lexi Winter AuthorDate: 2026-04-28 19:37:33 +0000 Commit: Lexi Winter CommitDate: 2026-07-25 13:01:23 +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 (cherry picked from commit c4b244af42a1f20937939a824b753a92c9c0a46f) --- 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 d2a091b54fb1..113d21dfa0fe 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