Page MenuHomeFreeBSD
Files F162572117

D56650.id176588.diff
No OneTemporary
Actions

D56650.id176588.diff
View Options

diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile
--- a/libexec/rc/rc.d/Makefile
+++ b/libexec/rc/rc.d/Makefile
@@ -88,9 +88,12 @@
.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
--- a/packages/Makefile.arm
+++ /dev/null
@@ -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
diff --git a/packages/Makefile.powerpc b/packages/Makefile.powerpc
deleted file mode 100644
--- a/packages/Makefile.powerpc
+++ /dev/null
@@ -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
diff --git a/packages/Makefile.riscv64 b/packages/Makefile.riscv64
--- 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
--- 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
--- a/sbin/devd/Makefile
+++ b/sbin/devd/Makefile
@@ -22,10 +22,13 @@
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
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -53,6 +53,10 @@
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

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 15, 4:19 PM (2 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35106403
Default Alt Text
D56650.id176588.diff (4 KB)

Event Timeline