1
0
mirror of https://git.FreeBSD.org/src.git synced 2026-06-02 11:24:32 +00:00

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
This commit is contained in:
Lexi Winter
2026-04-28 20:37:33 +01:00
parent cb0e3a5fba
commit c4b244af42
7 changed files with 10 additions and 41 deletions
+3
View File
@@ -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
-17
View File
@@ -1,17 +0,0 @@
# SPDX-License-Identifier: ISC
#
# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org>
#
# 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
-17
View File
@@ -1,17 +0,0 @@
# SPDX-License-Identifier: ISC
#
# Copyright (c) 2026 Lexi Winter <ivy@FreeBSD.org>
#
# 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
-1
View File
@@ -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
-6
View File
@@ -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
+3
View File
@@ -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}
+4
View File
@@ -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